diff --git a/client/ayon_core/addon/base.py b/client/ayon_core/addon/base.py
index d49358b0d2..2c6082256a 100644
--- a/client/ayon_core/addon/base.py
+++ b/client/ayon_core/addon/base.py
@@ -53,8 +53,10 @@ MOVED_ADDON_MILESTONE_VERSIONS = {
     "applications": VersionInfo(0, 2, 0),
     "clockify": VersionInfo(0, 2, 0),
     "tvpaint": VersionInfo(0, 2, 0),
+    "maya": VersionInfo(0, 2, 0),
 }
 
+
 # Inherit from `object` for Python 2 hosts
 class _ModuleClass(object):
     """Fake module class for storing AYON addons.
@@ -1323,7 +1325,7 @@ class TrayAddonsManager(AddonsManager):
         self.doubleclick_callback = None
 
     def add_doubleclick_callback(self, addon, callback):
-        """Register doubleclick callbacks on tray icon.
+        """Register double-click callbacks on tray icon.
 
         Currently, there is no way how to determine which is launched. Name of
         callback can be defined with `doubleclick_callback` attribute.
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py
index f1bc1cb2be..b1193fb914 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py
@@ -39,8 +39,8 @@ from ayon_core.lib import (
     EnumDef,
     is_in_tests,
 )
-from ayon_core.hosts.maya.api.lib_rendersettings import RenderSettings
-from ayon_core.hosts.maya.api.lib import get_attr_in_layer
+from ayon_maya.api.lib_rendersettings import RenderSettings
+from ayon_maya.api.lib import get_attr_in_layer
 
 from openpype_modules.deadline import abstract_submit_deadline
 from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo
diff --git a/pyproject.toml b/pyproject.toml
index 4726bef41a..63d7434c06 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -108,6 +108,10 @@ line-ending = "auto"
 # Ignore words that are not in the dictionary.
 ignore-words-list = "ayon,ynput,parms,parm,hda,developpement,ue"
 
+# Ignore lines that contain this regex. This is hack for missing inline ignore.
+# Remove with next codespell release (>2.2.6)
+ignore-regex = ".*codespell:ignore.*"
+
 skip = "./.*,./package/*,*/vendor/*,*/unreal/integration/*,*/aftereffects/api/extension/js/libs/*"
 count = true
 quiet-level = 3
diff --git a/client/ayon_core/hosts/maya/__init__.py b/server_addon/maya/client/ayon_maya/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/maya/__init__.py
rename to server_addon/maya/client/ayon_maya/__init__.py
diff --git a/client/ayon_core/hosts/maya/addon.py b/server_addon/maya/client/ayon_maya/addon.py
similarity index 100%
rename from client/ayon_core/hosts/maya/addon.py
rename to server_addon/maya/client/ayon_maya/addon.py
diff --git a/client/ayon_core/hosts/maya/api/__init__.py b/server_addon/maya/client/ayon_maya/api/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/maya/api/__init__.py
rename to server_addon/maya/client/ayon_maya/api/__init__.py
diff --git a/client/ayon_core/hosts/maya/api/action.py b/server_addon/maya/client/ayon_maya/api/action.py
similarity index 100%
rename from client/ayon_core/hosts/maya/api/action.py
rename to server_addon/maya/client/ayon_maya/api/action.py
diff --git a/client/ayon_core/hosts/maya/api/alembic.py b/server_addon/maya/client/ayon_maya/api/alembic.py
similarity index 99%
rename from client/ayon_core/hosts/maya/api/alembic.py
rename to server_addon/maya/client/ayon_maya/api/alembic.py
index 6bd00e1cb1..007e3ce4f3 100644
--- a/client/ayon_core/hosts/maya/api/alembic.py
+++ b/server_addon/maya/client/ayon_maya/api/alembic.py
@@ -4,7 +4,7 @@ import os
 
 from maya import cmds  # noqa
 
-from ayon_core.hosts.maya.api.lib import evaluation
+from ayon_maya.api.lib import evaluation
 
 log = logging.getLogger(__name__)
 
diff --git a/client/ayon_core/hosts/maya/api/commands.py b/server_addon/maya/client/ayon_maya/api/commands.py
similarity index 100%
rename from client/ayon_core/hosts/maya/api/commands.py
rename to server_addon/maya/client/ayon_maya/api/commands.py
diff --git a/client/ayon_core/hosts/maya/api/customize.py b/server_addon/maya/client/ayon_maya/api/customize.py
similarity index 100%
rename from client/ayon_core/hosts/maya/api/customize.py
rename to server_addon/maya/client/ayon_maya/api/customize.py
diff --git a/client/ayon_core/hosts/maya/api/exitstack.py b/server_addon/maya/client/ayon_maya/api/exitstack.py
similarity index 98%
rename from client/ayon_core/hosts/maya/api/exitstack.py
rename to server_addon/maya/client/ayon_maya/api/exitstack.py
index 5eb7e15784..c35724e889 100644
--- a/client/ayon_core/hosts/maya/api/exitstack.py
+++ b/server_addon/maya/client/ayon_maya/api/exitstack.py
@@ -6,7 +6,7 @@ compatible implementation to support bothPython 2 and Python 3.
 
 Instead of using ExitStack from contextlib, use it from this module:
 
->>> from ayon_core.hosts.maya.api.exitstack import ExitStack
+>>> from ayon_maya.api.exitstack import ExitStack
 
 It will provide the appropriate ExitStack implementation for the current
 running Python version.
diff --git a/client/ayon_core/hosts/maya/api/fbx.py b/server_addon/maya/client/ayon_maya/api/fbx.py
similarity index 99%
rename from client/ayon_core/hosts/maya/api/fbx.py
rename to server_addon/maya/client/ayon_maya/api/fbx.py
index fd1bf2c901..28a4058551 100644
--- a/client/ayon_core/hosts/maya/api/fbx.py
+++ b/server_addon/maya/client/ayon_maya/api/fbx.py
@@ -4,7 +4,7 @@ import logging
 
 from maya import cmds  # noqa
 import maya.mel as mel  # noqa
-from ayon_core.hosts.maya.api.lib import maintained_selection
+from ayon_maya.api.lib import maintained_selection
 
 
 class FBXExtractor:
diff --git a/client/ayon_core/hosts/maya/api/gltf.py b/server_addon/maya/client/ayon_maya/api/gltf.py
similarity index 97%
rename from client/ayon_core/hosts/maya/api/gltf.py
rename to server_addon/maya/client/ayon_maya/api/gltf.py
index 2a983f1573..9aa4bf37ef 100644
--- a/client/ayon_core/hosts/maya/api/gltf.py
+++ b/server_addon/maya/client/ayon_maya/api/gltf.py
@@ -16,7 +16,7 @@ _gltf_options = {
     "hbu": bool,                # hashBufferURI
     "ext": bool,                # externalTextures
     "ivt": int,                 # initialValuesTime
-    "acn": str,                 # animationClipName
+    "acn": str,                 # animationClipName  # codespell:ignore acn
     "ast": int,                 # animationClipStartTime
     "aet": int,                 # animationClipEndTime
     "afr": float,               # animationClipFrameRate
diff --git a/client/ayon_core/hosts/maya/api/lib.py b/server_addon/maya/client/ayon_maya/api/lib.py
similarity index 100%
rename from client/ayon_core/hosts/maya/api/lib.py
rename to server_addon/maya/client/ayon_maya/api/lib.py
diff --git a/client/ayon_core/hosts/maya/api/lib_renderproducts.py b/server_addon/maya/client/ayon_maya/api/lib_renderproducts.py
similarity index 100%
rename from client/ayon_core/hosts/maya/api/lib_renderproducts.py
rename to server_addon/maya/client/ayon_maya/api/lib_renderproducts.py
diff --git a/client/ayon_core/hosts/maya/api/lib_rendersettings.py b/server_addon/maya/client/ayon_maya/api/lib_rendersettings.py
similarity index 99%
rename from client/ayon_core/hosts/maya/api/lib_rendersettings.py
rename to server_addon/maya/client/ayon_maya/api/lib_rendersettings.py
index f9e243146a..f7f3f1d746 100644
--- a/client/ayon_core/hosts/maya/api/lib_rendersettings.py
+++ b/server_addon/maya/client/ayon_maya/api/lib_rendersettings.py
@@ -8,7 +8,7 @@ from ayon_core.settings import get_project_settings
 
 from ayon_core.pipeline import CreatorError, get_current_project_name
 from ayon_core.pipeline.context_tools import get_current_folder_entity
-from ayon_core.hosts.maya.api.lib import reset_frame_range
+from ayon_maya.api.lib import reset_frame_range
 
 
 class RenderSettings(object):
diff --git a/client/ayon_core/hosts/maya/api/lib_rendersetup.py b/server_addon/maya/client/ayon_maya/api/lib_rendersetup.py
similarity index 99%
rename from client/ayon_core/hosts/maya/api/lib_rendersetup.py
rename to server_addon/maya/client/ayon_maya/api/lib_rendersetup.py
index 6dca8eb6dd..d93e6af0e2 100644
--- a/client/ayon_core/hosts/maya/api/lib_rendersetup.py
+++ b/server_addon/maya/client/ayon_maya/api/lib_rendersetup.py
@@ -19,7 +19,7 @@ from maya.app.renderSetup.model.override import (
     UniqueOverride
 )
 
-from ayon_core.hosts.maya.api.lib import get_attribute
+from ayon_maya.api.lib import get_attribute
 
 EXACT_MATCH = 0
 PARENT_MATCH = 1
diff --git a/client/ayon_core/hosts/maya/api/menu.py b/server_addon/maya/client/ayon_maya/api/menu.py
similarity index 99%
rename from client/ayon_core/hosts/maya/api/menu.py
rename to server_addon/maya/client/ayon_maya/api/menu.py
index e3ef50cdc0..153aff07c3 100644
--- a/client/ayon_core/hosts/maya/api/menu.py
+++ b/server_addon/maya/client/ayon_maya/api/menu.py
@@ -15,7 +15,7 @@ from ayon_core.pipeline import (
 )
 from ayon_core.pipeline.workfile import BuildWorkfile
 from ayon_core.tools.utils import host_tools
-from ayon_core.hosts.maya.api import lib, lib_rendersettings
+from ayon_maya.api import lib, lib_rendersettings
 from .lib import get_main_window, IS_HEADLESS
 from ..tools import show_look_assigner
 
diff --git a/client/ayon_core/hosts/maya/api/pipeline.py b/server_addon/maya/client/ayon_maya/api/pipeline.py
similarity index 99%
rename from client/ayon_core/hosts/maya/api/pipeline.py
rename to server_addon/maya/client/ayon_maya/api/pipeline.py
index 74d73e5f95..84268cc6f1 100644
--- a/client/ayon_core/hosts/maya/api/pipeline.py
+++ b/server_addon/maya/client/ayon_maya/api/pipeline.py
@@ -45,8 +45,8 @@ from ayon_core.pipeline.workfile.lock_workfile import (
     is_workfile_locked,
     is_workfile_lock_enabled
 )
-from ayon_core.hosts.maya import MAYA_ROOT_DIR
-from ayon_core.hosts.maya.lib import create_workspace_mel
+from ayon_maya import MAYA_ROOT_DIR
+from ayon_maya.lib import create_workspace_mel
 
 from . import menu, lib
 from .workio import (
@@ -58,7 +58,7 @@ from .workio import (
     current_file
 )
 
-log = logging.getLogger("ayon_core.hosts.maya")
+log = logging.getLogger("ayon_maya")
 
 PLUGINS_DIR = os.path.join(MAYA_ROOT_DIR, "plugins")
 PUBLISH_PATH = os.path.join(PLUGINS_DIR, "publish")
diff --git a/client/ayon_core/hosts/maya/api/plugin.py b/server_addon/maya/client/ayon_maya/api/plugin.py
similarity index 99%
rename from client/ayon_core/hosts/maya/api/plugin.py
rename to server_addon/maya/client/ayon_maya/api/plugin.py
index 6f8b74c906..0eb998cb36 100644
--- a/client/ayon_core/hosts/maya/api/plugin.py
+++ b/server_addon/maya/client/ayon_maya/api/plugin.py
@@ -809,7 +809,7 @@ class ReferenceLoader(Loader):
     def update(self, container, context):
         from maya import cmds
 
-        from ayon_core.hosts.maya.api.lib import get_container_members
+        from ayon_maya.api.lib import get_container_members
 
         node = container["objectName"]
 
diff --git a/client/ayon_core/hosts/maya/api/render_setup_tools.py b/server_addon/maya/client/ayon_maya/api/render_setup_tools.py
similarity index 100%
rename from client/ayon_core/hosts/maya/api/render_setup_tools.py
rename to server_addon/maya/client/ayon_maya/api/render_setup_tools.py
diff --git a/client/ayon_core/hosts/maya/api/setdress.py b/server_addon/maya/client/ayon_maya/api/setdress.py
similarity index 99%
rename from client/ayon_core/hosts/maya/api/setdress.py
rename to server_addon/maya/client/ayon_maya/api/setdress.py
index b1d5beb343..a130b93f4f 100644
--- a/client/ayon_core/hosts/maya/api/setdress.py
+++ b/server_addon/maya/client/ayon_maya/api/setdress.py
@@ -20,7 +20,7 @@ from ayon_core.pipeline import (
     get_representation_path,
     get_current_project_name,
 )
-from ayon_core.hosts.maya.api.lib import (
+from ayon_maya.api.lib import (
     matrix_equals,
     unique_namespace,
     get_container_transforms,
diff --git a/client/ayon_core/hosts/maya/api/workfile_template_builder.py b/server_addon/maya/client/ayon_maya/api/workfile_template_builder.py
similarity index 100%
rename from client/ayon_core/hosts/maya/api/workfile_template_builder.py
rename to server_addon/maya/client/ayon_maya/api/workfile_template_builder.py
diff --git a/client/ayon_core/hosts/maya/api/workio.py b/server_addon/maya/client/ayon_maya/api/workio.py
similarity index 100%
rename from client/ayon_core/hosts/maya/api/workio.py
rename to server_addon/maya/client/ayon_maya/api/workio.py
diff --git a/client/ayon_core/hosts/maya/api/yeti.py b/server_addon/maya/client/ayon_maya/api/yeti.py
similarity index 100%
rename from client/ayon_core/hosts/maya/api/yeti.py
rename to server_addon/maya/client/ayon_maya/api/yeti.py
diff --git a/client/ayon_core/hosts/maya/hooks/pre_auto_load_plugins.py b/server_addon/maya/client/ayon_maya/hooks/pre_auto_load_plugins.py
similarity index 100%
rename from client/ayon_core/hosts/maya/hooks/pre_auto_load_plugins.py
rename to server_addon/maya/client/ayon_maya/hooks/pre_auto_load_plugins.py
diff --git a/client/ayon_core/hosts/maya/hooks/pre_copy_mel.py b/server_addon/maya/client/ayon_maya/hooks/pre_copy_mel.py
similarity index 92%
rename from client/ayon_core/hosts/maya/hooks/pre_copy_mel.py
rename to server_addon/maya/client/ayon_maya/hooks/pre_copy_mel.py
index 683b4c59c7..c3268b09ee 100644
--- a/client/ayon_core/hosts/maya/hooks/pre_copy_mel.py
+++ b/server_addon/maya/client/ayon_maya/hooks/pre_copy_mel.py
@@ -1,5 +1,5 @@
 from ayon_applications import PreLaunchHook, LaunchTypes
-from ayon_core.hosts.maya.lib import create_workspace_mel
+from ayon_maya.lib import create_workspace_mel
 
 
 class PreCopyMel(PreLaunchHook):
diff --git a/client/ayon_core/hosts/maya/hooks/pre_open_workfile_post_initialization.py b/server_addon/maya/client/ayon_maya/hooks/pre_open_workfile_post_initialization.py
similarity index 100%
rename from client/ayon_core/hosts/maya/hooks/pre_open_workfile_post_initialization.py
rename to server_addon/maya/client/ayon_maya/hooks/pre_open_workfile_post_initialization.py
diff --git a/client/ayon_core/hosts/maya/lib.py b/server_addon/maya/client/ayon_maya/lib.py
similarity index 100%
rename from client/ayon_core/hosts/maya/lib.py
rename to server_addon/maya/client/ayon_maya/lib.py
diff --git a/client/ayon_core/hosts/maya/plugins/__init__.py b/server_addon/maya/client/ayon_maya/plugins/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/__init__.py
rename to server_addon/maya/client/ayon_maya/plugins/__init__.py
diff --git a/client/ayon_core/hosts/maya/plugins/create/convert_legacy.py b/server_addon/maya/client/ayon_maya/plugins/create/convert_legacy.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/create/convert_legacy.py
rename to server_addon/maya/client/ayon_maya/plugins/create/convert_legacy.py
index 81cf9613b4..8616413bdd 100644
--- a/client/ayon_core/hosts/maya/plugins/create/convert_legacy.py
+++ b/server_addon/maya/client/ayon_maya/plugins/create/convert_legacy.py
@@ -1,8 +1,8 @@
 import ayon_api
 
 from ayon_core.pipeline.create.creator_plugins import ProductConvertorPlugin
-from ayon_core.hosts.maya.api import plugin
-from ayon_core.hosts.maya.api.lib import read
+from ayon_maya.api import plugin
+from ayon_maya.api.lib import read
 
 from maya import cmds
 from maya.app.renderSetup.model import renderSetup
@@ -12,7 +12,7 @@ class MayaLegacyConvertor(ProductConvertorPlugin,
                           plugin.MayaCreatorBase):
     """Find and convert any legacy products in the scene.
 
-    This Convertor will find all legacy products in the scene and will
+    This Converter will find all legacy products in the scene and will
     transform them to the current system. Since the old products doesn't
     retain any information about their original creators, the only mapping
     we can do is based on their families.
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_animation_pointcache.py b/server_addon/maya/client/ayon_maya/plugins/create/create_animation_pointcache.py
similarity index 98%
rename from client/ayon_core/hosts/maya/plugins/create/create_animation_pointcache.py
rename to server_addon/maya/client/ayon_maya/plugins/create/create_animation_pointcache.py
index 069762e4ae..ea4cdb57fe 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_animation_pointcache.py
+++ b/server_addon/maya/client/ayon_maya/plugins/create/create_animation_pointcache.py
@@ -1,6 +1,6 @@
 from maya import cmds
 
-from ayon_core.hosts.maya.api import lib, plugin
+from ayon_maya.api import lib, plugin
 
 from ayon_core.lib import (
     BoolDef,
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_arnold_scene_source.py b/server_addon/maya/client/ayon_maya/plugins/create/create_arnold_scene_source.py
similarity index 98%
rename from client/ayon_core/hosts/maya/plugins/create/create_arnold_scene_source.py
rename to server_addon/maya/client/ayon_maya/plugins/create/create_arnold_scene_source.py
index e321c13ca0..8ae2759628 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_arnold_scene_source.py
+++ b/server_addon/maya/client/ayon_maya/plugins/create/create_arnold_scene_source.py
@@ -1,6 +1,6 @@
 from maya import cmds
 
-from ayon_core.hosts.maya.api import (
+from ayon_maya.api import (
     lib,
     plugin
 )
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_assembly.py b/server_addon/maya/client/ayon_maya/plugins/create/create_assembly.py
similarity index 83%
rename from client/ayon_core/hosts/maya/plugins/create/create_assembly.py
rename to server_addon/maya/client/ayon_maya/plugins/create/create_assembly.py
index 92df125748..dff04f059e 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_assembly.py
+++ b/server_addon/maya/client/ayon_maya/plugins/create/create_assembly.py
@@ -1,4 +1,4 @@
-from ayon_core.hosts.maya.api import plugin
+from ayon_maya.api import plugin
 
 
 class CreateAssembly(plugin.MayaCreator):
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_camera.py b/server_addon/maya/client/ayon_maya/plugins/create/create_camera.py
similarity index 95%
rename from client/ayon_core/hosts/maya/plugins/create/create_camera.py
rename to server_addon/maya/client/ayon_maya/plugins/create/create_camera.py
index 4b1265bd3b..393176f5dd 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_camera.py
+++ b/server_addon/maya/client/ayon_maya/plugins/create/create_camera.py
@@ -1,4 +1,4 @@
-from ayon_core.hosts.maya.api import (
+from ayon_maya.api import (
     lib,
     plugin
 )
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_layout.py b/server_addon/maya/client/ayon_maya/plugins/create/create_layout.py
similarity index 92%
rename from client/ayon_core/hosts/maya/plugins/create/create_layout.py
rename to server_addon/maya/client/ayon_maya/plugins/create/create_layout.py
index 6cbc697502..1d9bc2c1c8 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_layout.py
+++ b/server_addon/maya/client/ayon_maya/plugins/create/create_layout.py
@@ -1,4 +1,4 @@
-from ayon_core.hosts.maya.api import plugin
+from ayon_maya.api import plugin
 from ayon_core.lib import BoolDef
 
 
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_look.py b/server_addon/maya/client/ayon_maya/plugins/create/create_look.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/create/create_look.py
rename to server_addon/maya/client/ayon_maya/plugins/create/create_look.py
index ac3625c38f..1f90d18607 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_look.py
+++ b/server_addon/maya/client/ayon_maya/plugins/create/create_look.py
@@ -1,4 +1,4 @@
-from ayon_core.hosts.maya.api import (
+from ayon_maya.api import (
     plugin,
     lib
 )
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_matchmove.py b/server_addon/maya/client/ayon_maya/plugins/create/create_matchmove.py
similarity index 94%
rename from client/ayon_core/hosts/maya/plugins/create/create_matchmove.py
rename to server_addon/maya/client/ayon_maya/plugins/create/create_matchmove.py
index 44443a8b9f..9cb2a3dd47 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_matchmove.py
+++ b/server_addon/maya/client/ayon_maya/plugins/create/create_matchmove.py
@@ -1,4 +1,4 @@
-from ayon_core.hosts.maya.api import (
+from ayon_maya.api import (
     lib,
     plugin
 )
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_maya_usd.py b/server_addon/maya/client/ayon_maya/plugins/create/create_maya_usd.py
similarity index 98%
rename from client/ayon_core/hosts/maya/plugins/create/create_maya_usd.py
rename to server_addon/maya/client/ayon_maya/plugins/create/create_maya_usd.py
index 3f34a541b4..19b55384f3 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_maya_usd.py
+++ b/server_addon/maya/client/ayon_maya/plugins/create/create_maya_usd.py
@@ -1,4 +1,4 @@
-from ayon_core.hosts.maya.api import plugin, lib
+from ayon_maya.api import plugin, lib
 from ayon_core.lib import (
     BoolDef,
     EnumDef,
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_mayascene.py b/server_addon/maya/client/ayon_maya/plugins/create/create_mayascene.py
similarity index 84%
rename from client/ayon_core/hosts/maya/plugins/create/create_mayascene.py
rename to server_addon/maya/client/ayon_maya/plugins/create/create_mayascene.py
index cfe46336a2..9913efc016 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_mayascene.py
+++ b/server_addon/maya/client/ayon_maya/plugins/create/create_mayascene.py
@@ -1,4 +1,4 @@
-from ayon_core.hosts.maya.api import plugin
+from ayon_maya.api import plugin
 
 
 class CreateMayaScene(plugin.MayaCreator):
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_model.py b/server_addon/maya/client/ayon_maya/plugins/create/create_model.py
similarity index 96%
rename from client/ayon_core/hosts/maya/plugins/create/create_model.py
rename to server_addon/maya/client/ayon_maya/plugins/create/create_model.py
index b47df421f3..87696c58d2 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_model.py
+++ b/server_addon/maya/client/ayon_maya/plugins/create/create_model.py
@@ -1,4 +1,4 @@
-from ayon_core.hosts.maya.api import plugin
+from ayon_maya.api import plugin
 from ayon_core.lib import (
     BoolDef,
     TextDef
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_multishot_layout.py b/server_addon/maya/client/ayon_maya/plugins/create/create_multishot_layout.py
similarity index 99%
rename from client/ayon_core/hosts/maya/plugins/create/create_multishot_layout.py
rename to server_addon/maya/client/ayon_maya/plugins/create/create_multishot_layout.py
index 7216236719..5229823110 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_multishot_layout.py
+++ b/server_addon/maya/client/ayon_maya/plugins/create/create_multishot_layout.py
@@ -8,7 +8,7 @@ from ayon_api import (
 )
 from maya import cmds  # noqa: F401
 
-from ayon_core.hosts.maya.api import plugin
+from ayon_maya.api import plugin
 from ayon_core.lib import BoolDef, EnumDef, TextDef
 from ayon_core.pipeline import (
     Creator,
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_multiverse_look.py b/server_addon/maya/client/ayon_maya/plugins/create/create_multiverse_look.py
similarity index 93%
rename from client/ayon_core/hosts/maya/plugins/create/create_multiverse_look.py
rename to server_addon/maya/client/ayon_maya/plugins/create/create_multiverse_look.py
index de604a33b3..f2dcb77187 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_multiverse_look.py
+++ b/server_addon/maya/client/ayon_maya/plugins/create/create_multiverse_look.py
@@ -1,4 +1,4 @@
-from ayon_core.hosts.maya.api import plugin
+from ayon_maya.api import plugin
 from ayon_core.lib import (
     BoolDef,
     EnumDef
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd.py b/server_addon/maya/client/ayon_maya/plugins/create/create_multiverse_usd.py
similarity index 99%
rename from client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd.py
rename to server_addon/maya/client/ayon_maya/plugins/create/create_multiverse_usd.py
index 668700995f..bdcea4cd2c 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd.py
+++ b/server_addon/maya/client/ayon_maya/plugins/create/create_multiverse_usd.py
@@ -1,4 +1,4 @@
-from ayon_core.hosts.maya.api import plugin, lib
+from ayon_maya.api import plugin, lib
 from ayon_core.lib import (
     BoolDef,
     NumberDef,
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd_comp.py b/server_addon/maya/client/ayon_maya/plugins/create/create_multiverse_usd_comp.py
similarity index 96%
rename from client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd_comp.py
rename to server_addon/maya/client/ayon_maya/plugins/create/create_multiverse_usd_comp.py
index 120e6ad920..2459704d14 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd_comp.py
+++ b/server_addon/maya/client/ayon_maya/plugins/create/create_multiverse_usd_comp.py
@@ -1,4 +1,4 @@
-from ayon_core.hosts.maya.api import plugin, lib
+from ayon_maya.api import plugin, lib
 from ayon_core.lib import (
     BoolDef,
     NumberDef,
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd_over.py b/server_addon/maya/client/ayon_maya/plugins/create/create_multiverse_usd_over.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd_over.py
rename to server_addon/maya/client/ayon_maya/plugins/create/create_multiverse_usd_over.py
index 26208794e3..b070daf550 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd_over.py
+++ b/server_addon/maya/client/ayon_maya/plugins/create/create_multiverse_usd_over.py
@@ -1,4 +1,4 @@
-from ayon_core.hosts.maya.api import plugin, lib
+from ayon_maya.api import plugin, lib
 from ayon_core.lib import (
     BoolDef,
     NumberDef,
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_proxy_abc.py b/server_addon/maya/client/ayon_maya/plugins/create/create_proxy_abc.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/create/create_proxy_abc.py
rename to server_addon/maya/client/ayon_maya/plugins/create/create_proxy_abc.py
index ecc031436c..431f113941 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_proxy_abc.py
+++ b/server_addon/maya/client/ayon_maya/plugins/create/create_proxy_abc.py
@@ -1,4 +1,4 @@
-from ayon_core.hosts.maya.api import (
+from ayon_maya.api import (
     lib,
     plugin
 )
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_redshift_proxy.py b/server_addon/maya/client/ayon_maya/plugins/create/create_redshift_proxy.py
similarity index 92%
rename from client/ayon_core/hosts/maya/plugins/create/create_redshift_proxy.py
rename to server_addon/maya/client/ayon_maya/plugins/create/create_redshift_proxy.py
index d99fe5a787..c4cc874a2a 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_redshift_proxy.py
+++ b/server_addon/maya/client/ayon_maya/plugins/create/create_redshift_proxy.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """Creator of Redshift proxy product types."""
 
-from ayon_core.hosts.maya.api import plugin, lib
+from ayon_maya.api import plugin, lib
 from ayon_core.lib import BoolDef
 
 
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_render.py b/server_addon/maya/client/ayon_maya/plugins/create/create_render.py
similarity index 99%
rename from client/ayon_core/hosts/maya/plugins/create/create_render.py
rename to server_addon/maya/client/ayon_maya/plugins/create/create_render.py
index e5a8d4dbd8..5defee7d07 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_render.py
+++ b/server_addon/maya/client/ayon_maya/plugins/create/create_render.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """Create ``Render`` instance in Maya."""
 
-from ayon_core.hosts.maya.api import (
+from ayon_maya.api import (
     lib_rendersettings,
     plugin
 )
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_rendersetup.py b/server_addon/maya/client/ayon_maya/plugins/create/create_rendersetup.py
similarity index 95%
rename from client/ayon_core/hosts/maya/plugins/create/create_rendersetup.py
rename to server_addon/maya/client/ayon_maya/plugins/create/create_rendersetup.py
index 3d8d6a7309..415ab4ff8c 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_rendersetup.py
+++ b/server_addon/maya/client/ayon_maya/plugins/create/create_rendersetup.py
@@ -1,4 +1,4 @@
-from ayon_core.hosts.maya.api import plugin
+from ayon_maya.api import plugin
 from ayon_core.pipeline import CreatorError
 
 
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_review.py b/server_addon/maya/client/ayon_maya/plugins/create/create_review.py
similarity index 99%
rename from client/ayon_core/hosts/maya/plugins/create/create_review.py
rename to server_addon/maya/client/ayon_maya/plugins/create/create_review.py
index 8a2f2df745..26fad91ed9 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_review.py
+++ b/server_addon/maya/client/ayon_maya/plugins/create/create_review.py
@@ -3,7 +3,7 @@ import json
 from maya import cmds
 import ayon_api
 
-from ayon_core.hosts.maya.api import (
+from ayon_maya.api import (
     lib,
     plugin
 )
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_rig.py b/server_addon/maya/client/ayon_maya/plugins/create/create_rig.py
similarity index 96%
rename from client/ayon_core/hosts/maya/plugins/create/create_rig.py
rename to server_addon/maya/client/ayon_maya/plugins/create/create_rig.py
index 54be50c169..135e51bcbf 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_rig.py
+++ b/server_addon/maya/client/ayon_maya/plugins/create/create_rig.py
@@ -1,6 +1,6 @@
 from maya import cmds
 
-from ayon_core.hosts.maya.api import plugin
+from ayon_maya.api import plugin
 
 
 class CreateRig(plugin.MayaCreator):
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_setdress.py b/server_addon/maya/client/ayon_maya/plugins/create/create_setdress.py
similarity index 91%
rename from client/ayon_core/hosts/maya/plugins/create/create_setdress.py
rename to server_addon/maya/client/ayon_maya/plugins/create/create_setdress.py
index 0f72d4d184..12532e0724 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_setdress.py
+++ b/server_addon/maya/client/ayon_maya/plugins/create/create_setdress.py
@@ -1,4 +1,4 @@
-from ayon_core.hosts.maya.api import plugin
+from ayon_maya.api import plugin
 from ayon_core.lib import BoolDef
 
 
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_unreal_skeletalmesh.py b/server_addon/maya/client/ayon_maya/plugins/create/create_unreal_skeletalmesh.py
similarity index 98%
rename from client/ayon_core/hosts/maya/plugins/create/create_unreal_skeletalmesh.py
rename to server_addon/maya/client/ayon_maya/plugins/create/create_unreal_skeletalmesh.py
index a32e94971e..a182fe7a24 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_unreal_skeletalmesh.py
+++ b/server_addon/maya/client/ayon_maya/plugins/create/create_unreal_skeletalmesh.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """Creator for Unreal Skeletal Meshes."""
-from ayon_core.hosts.maya.api import plugin, lib
+from ayon_maya.api import plugin, lib
 from ayon_core.lib import (
     BoolDef,
     TextDef
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_unreal_staticmesh.py b/server_addon/maya/client/ayon_maya/plugins/create/create_unreal_staticmesh.py
similarity index 98%
rename from client/ayon_core/hosts/maya/plugins/create/create_unreal_staticmesh.py
rename to server_addon/maya/client/ayon_maya/plugins/create/create_unreal_staticmesh.py
index 76c33f00cc..e5436bca64 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_unreal_staticmesh.py
+++ b/server_addon/maya/client/ayon_maya/plugins/create/create_unreal_staticmesh.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """Creator for Unreal Static Meshes."""
-from ayon_core.hosts.maya.api import plugin, lib
+from ayon_maya.api import plugin, lib
 from maya import cmds  # noqa
 
 
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_unreal_yeticache.py b/server_addon/maya/client/ayon_maya/plugins/create/create_unreal_yeticache.py
similarity index 96%
rename from client/ayon_core/hosts/maya/plugins/create/create_unreal_yeticache.py
rename to server_addon/maya/client/ayon_maya/plugins/create/create_unreal_yeticache.py
index dea64b40fb..eea866d406 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_unreal_yeticache.py
+++ b/server_addon/maya/client/ayon_maya/plugins/create/create_unreal_yeticache.py
@@ -1,4 +1,4 @@
-from ayon_core.hosts.maya.api import (
+from ayon_maya.api import (
     lib,
     plugin
 )
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_vrayproxy.py b/server_addon/maya/client/ayon_maya/plugins/create/create_vrayproxy.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/create/create_vrayproxy.py
rename to server_addon/maya/client/ayon_maya/plugins/create/create_vrayproxy.py
index d565ec37e0..742e14ace0 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_vrayproxy.py
+++ b/server_addon/maya/client/ayon_maya/plugins/create/create_vrayproxy.py
@@ -1,4 +1,4 @@
-from ayon_core.hosts.maya.api import (
+from ayon_maya.api import (
     plugin,
     lib
 )
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_vrayscene.py b/server_addon/maya/client/ayon_maya/plugins/create/create_vrayscene.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/create/create_vrayscene.py
rename to server_addon/maya/client/ayon_maya/plugins/create/create_vrayscene.py
index cf5e7b5364..11c356fdef 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_vrayscene.py
+++ b/server_addon/maya/client/ayon_maya/plugins/create/create_vrayscene.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """Create instance of vrayscene."""
 
-from ayon_core.hosts.maya.api import (
+from ayon_maya.api import (
     lib_rendersettings,
     plugin
 )
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_workfile.py b/server_addon/maya/client/ayon_maya/plugins/create/create_workfile.py
similarity index 98%
rename from client/ayon_core/hosts/maya/plugins/create/create_workfile.py
rename to server_addon/maya/client/ayon_maya/plugins/create/create_workfile.py
index f636ed7b74..e0c94611b0 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_workfile.py
+++ b/server_addon/maya/client/ayon_maya/plugins/create/create_workfile.py
@@ -3,7 +3,7 @@
 import ayon_api
 
 from ayon_core.pipeline import CreatedInstance, AutoCreator
-from ayon_core.hosts.maya.api import plugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_xgen.py b/server_addon/maya/client/ayon_maya/plugins/create/create_xgen.py
similarity index 79%
rename from client/ayon_core/hosts/maya/plugins/create/create_xgen.py
rename to server_addon/maya/client/ayon_maya/plugins/create/create_xgen.py
index fec2f07456..d13d032a13 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_xgen.py
+++ b/server_addon/maya/client/ayon_maya/plugins/create/create_xgen.py
@@ -1,4 +1,4 @@
-from ayon_core.hosts.maya.api import plugin
+from ayon_maya.api import plugin
 
 
 class CreateXgen(plugin.MayaCreator):
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_yeti_cache.py b/server_addon/maya/client/ayon_maya/plugins/create/create_yeti_cache.py
similarity index 96%
rename from client/ayon_core/hosts/maya/plugins/create/create_yeti_cache.py
rename to server_addon/maya/client/ayon_maya/plugins/create/create_yeti_cache.py
index bf20acaca8..8a834f18c0 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_yeti_cache.py
+++ b/server_addon/maya/client/ayon_maya/plugins/create/create_yeti_cache.py
@@ -1,4 +1,4 @@
-from ayon_core.hosts.maya.api import (
+from ayon_maya.api import (
     lib,
     plugin
 )
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_yeti_rig.py b/server_addon/maya/client/ayon_maya/plugins/create/create_yeti_rig.py
similarity index 95%
rename from client/ayon_core/hosts/maya/plugins/create/create_yeti_rig.py
rename to server_addon/maya/client/ayon_maya/plugins/create/create_yeti_rig.py
index dfe224ceb1..c5378dc1b8 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_yeti_rig.py
+++ b/server_addon/maya/client/ayon_maya/plugins/create/create_yeti_rig.py
@@ -1,6 +1,6 @@
 from maya import cmds
 
-from ayon_core.hosts.maya.api import (
+from ayon_maya.api import (
     lib,
     plugin
 )
diff --git a/client/ayon_core/hosts/maya/plugins/inventory/connect_geometry.py b/server_addon/maya/client/ayon_maya/plugins/inventory/connect_geometry.py
similarity index 99%
rename from client/ayon_core/hosts/maya/plugins/inventory/connect_geometry.py
rename to server_addon/maya/client/ayon_maya/plugins/inventory/connect_geometry.py
index 5410546a2e..ccb88313e9 100644
--- a/client/ayon_core/hosts/maya/plugins/inventory/connect_geometry.py
+++ b/server_addon/maya/client/ayon_maya/plugins/inventory/connect_geometry.py
@@ -1,7 +1,7 @@
 from maya import cmds
 
 from ayon_core.pipeline import InventoryAction, get_repres_contexts
-from ayon_core.hosts.maya.api.lib import get_id
+from ayon_maya.api.lib import get_id
 
 
 class ConnectGeometry(InventoryAction):
diff --git a/client/ayon_core/hosts/maya/plugins/inventory/connect_xgen.py b/server_addon/maya/client/ayon_maya/plugins/inventory/connect_xgen.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/inventory/connect_xgen.py
rename to server_addon/maya/client/ayon_maya/plugins/inventory/connect_xgen.py
diff --git a/client/ayon_core/hosts/maya/plugins/inventory/connect_yeti_rig.py b/server_addon/maya/client/ayon_maya/plugins/inventory/connect_yeti_rig.py
similarity index 98%
rename from client/ayon_core/hosts/maya/plugins/inventory/connect_yeti_rig.py
rename to server_addon/maya/client/ayon_maya/plugins/inventory/connect_yeti_rig.py
index 8f13cc6ae5..2385444403 100644
--- a/client/ayon_core/hosts/maya/plugins/inventory/connect_yeti_rig.py
+++ b/server_addon/maya/client/ayon_maya/plugins/inventory/connect_yeti_rig.py
@@ -9,7 +9,7 @@ from ayon_core.pipeline import (
     get_repres_contexts,
     get_representation_path,
 )
-from ayon_core.hosts.maya.api.lib import get_container_members, get_id
+from ayon_maya.api.lib import get_container_members, get_id
 
 
 class ConnectYetiRig(InventoryAction):
diff --git a/client/ayon_core/hosts/maya/plugins/inventory/import_modelrender.py b/server_addon/maya/client/ayon_maya/plugins/inventory/import_modelrender.py
similarity index 99%
rename from client/ayon_core/hosts/maya/plugins/inventory/import_modelrender.py
rename to server_addon/maya/client/ayon_maya/plugins/inventory/import_modelrender.py
index 4655017ae5..5e36ec6bc1 100644
--- a/client/ayon_core/hosts/maya/plugins/inventory/import_modelrender.py
+++ b/server_addon/maya/client/ayon_maya/plugins/inventory/import_modelrender.py
@@ -8,7 +8,7 @@ from ayon_core.pipeline import (
     InventoryAction,
     get_current_project_name,
 )
-from ayon_core.hosts.maya.api.lib import (
+from ayon_maya.api.lib import (
     maintained_selection,
     apply_shaders
 )
diff --git a/client/ayon_core/hosts/maya/plugins/inventory/import_reference.py b/server_addon/maya/client/ayon_maya/plugins/inventory/import_reference.py
similarity index 92%
rename from client/ayon_core/hosts/maya/plugins/inventory/import_reference.py
rename to server_addon/maya/client/ayon_maya/plugins/inventory/import_reference.py
index 771cb96a57..5e42facad4 100644
--- a/client/ayon_core/hosts/maya/plugins/inventory/import_reference.py
+++ b/server_addon/maya/client/ayon_maya/plugins/inventory/import_reference.py
@@ -1,7 +1,7 @@
 from maya import cmds
 
 from ayon_core.pipeline import InventoryAction
-from ayon_core.hosts.maya.api.lib import get_reference_node
+from ayon_maya.api.lib import get_reference_node
 
 
 class ImportReference(InventoryAction):
diff --git a/client/ayon_core/hosts/maya/plugins/inventory/rig_recreate_animation_instance.py b/server_addon/maya/client/ayon_maya/plugins/inventory/rig_recreate_animation_instance.py
similarity index 96%
rename from client/ayon_core/hosts/maya/plugins/inventory/rig_recreate_animation_instance.py
rename to server_addon/maya/client/ayon_maya/plugins/inventory/rig_recreate_animation_instance.py
index cbff293cd7..796a651f8a 100644
--- a/client/ayon_core/hosts/maya/plugins/inventory/rig_recreate_animation_instance.py
+++ b/server_addon/maya/client/ayon_maya/plugins/inventory/rig_recreate_animation_instance.py
@@ -3,7 +3,7 @@ from ayon_core.pipeline import (
     get_current_project_name,
 )
 from ayon_core.pipeline.load import get_representation_contexts_by_ids
-from ayon_core.hosts.maya.api.lib import (
+from ayon_maya.api.lib import (
     create_rig_animation_instance,
     get_container_members,
 )
diff --git a/client/ayon_core/hosts/maya/plugins/inventory/select_containers.py b/server_addon/maya/client/ayon_maya/plugins/inventory/select_containers.py
similarity index 95%
rename from client/ayon_core/hosts/maya/plugins/inventory/select_containers.py
rename to server_addon/maya/client/ayon_maya/plugins/inventory/select_containers.py
index f0bb2fc376..e45c8a5706 100644
--- a/client/ayon_core/hosts/maya/plugins/inventory/select_containers.py
+++ b/server_addon/maya/client/ayon_maya/plugins/inventory/select_containers.py
@@ -1,7 +1,7 @@
 from maya import cmds
 
 from ayon_core.pipeline import InventoryAction, registered_host
-from ayon_core.hosts.maya.api.lib import get_container_members
+from ayon_maya.api.lib import get_container_members
 
 
 class SelectInScene(InventoryAction):
diff --git a/client/ayon_core/hosts/maya/plugins/load/_load_animation.py b/server_addon/maya/client/ayon_maya/plugins/load/_load_animation.py
similarity index 91%
rename from client/ayon_core/hosts/maya/plugins/load/_load_animation.py
rename to server_addon/maya/client/ayon_maya/plugins/load/_load_animation.py
index 393f6b0115..6d4ebe250c 100644
--- a/client/ayon_core/hosts/maya/plugins/load/_load_animation.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/_load_animation.py
@@ -1,4 +1,4 @@
-import ayon_core.hosts.maya.api.plugin
+import ayon_maya.api.plugin
 import maya.cmds as cmds
 
 
@@ -14,7 +14,7 @@ def _process_reference(file_url, name, namespace, options):
     Returns:
         list: list of object nodes
     """
-    from ayon_core.hosts.maya.api.lib import unique_namespace
+    from ayon_maya.api.lib import unique_namespace
     # Get name from asset being loaded
     # Assuming name is product name from the animation, we split the number
     # suffix from the name to ensure the namespace is unique
@@ -43,7 +43,7 @@ def _process_reference(file_url, name, namespace, options):
     return nodes
 
 
-class AbcLoader(ayon_core.hosts.maya.api.plugin.ReferenceLoader):
+class AbcLoader(ayon_maya.api.plugin.ReferenceLoader):
     """Loader to reference an Alembic file"""
 
     product_types = {
@@ -74,7 +74,7 @@ class AbcLoader(ayon_core.hosts.maya.api.plugin.ReferenceLoader):
         return nodes
 
 
-class FbxLoader(ayon_core.hosts.maya.api.plugin.ReferenceLoader):
+class FbxLoader(ayon_maya.api.plugin.ReferenceLoader):
     """Loader to reference an Fbx files"""
 
     product_types = {
diff --git a/client/ayon_core/hosts/maya/plugins/load/actions.py b/server_addon/maya/client/ayon_maya/plugins/load/actions.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/load/actions.py
rename to server_addon/maya/client/ayon_maya/plugins/load/actions.py
index 8bef219812..d28645ea43 100644
--- a/client/ayon_core/hosts/maya/plugins/load/actions.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/actions.py
@@ -3,11 +3,11 @@
 """
 import qargparse
 from ayon_core.pipeline import load
-from ayon_core.hosts.maya.api.lib import (
+from ayon_maya.api.lib import (
     maintained_selection,
     get_custom_namespace
 )
-import ayon_core.hosts.maya.api.plugin
+import ayon_maya.api.plugin
 
 
 class SetFrameRangeLoader(load.LoaderPlugin):
@@ -85,7 +85,7 @@ class SetFrameRangeWithHandlesLoader(load.LoaderPlugin):
                              animationEndTime=end)
 
 
-class ImportMayaLoader(ayon_core.hosts.maya.api.plugin.Loader):
+class ImportMayaLoader(ayon_maya.api.plugin.Loader):
     """Import action for Maya (unmanaged)
 
     Warning:
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_arnold_standin.py b/server_addon/maya/client/ayon_maya/plugins/load/load_arnold_standin.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/load/load_arnold_standin.py
rename to server_addon/maya/client/ayon_maya/plugins/load/load_arnold_standin.py
index ae3b68965a..db81199ed6 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_arnold_standin.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_arnold_standin.py
@@ -8,14 +8,14 @@ from ayon_core.pipeline import (
     load,
     get_representation_path
 )
-from ayon_core.hosts.maya.api.lib import (
+from ayon_maya.api.lib import (
     unique_namespace,
     get_attribute_input,
     maintained_selection,
     get_fps_for_current_context
 )
-from ayon_core.hosts.maya.api.pipeline import containerise
-from ayon_core.hosts.maya.api.plugin import get_load_color_for_product_type
+from ayon_maya.api.pipeline import containerise
+from ayon_maya.api.plugin import get_load_color_for_product_type
 
 
 def is_sequence(files):
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_as_template.py b/server_addon/maya/client/ayon_maya/plugins/load/load_as_template.py
similarity index 94%
rename from client/ayon_core/hosts/maya/plugins/load/load_as_template.py
rename to server_addon/maya/client/ayon_maya/plugins/load/load_as_template.py
index f696d369e3..2a29faa77d 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_as_template.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_as_template.py
@@ -5,7 +5,7 @@ from ayon_core.pipeline import (
     load,
     registered_host
 )
-from ayon_core.hosts.maya.api.workfile_template_builder import (
+from ayon_maya.api.workfile_template_builder import (
     MayaTemplateBuilder
 )
 
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_assembly.py b/server_addon/maya/client/ayon_maya/plugins/load/load_assembly.py
similarity index 93%
rename from client/ayon_core/hosts/maya/plugins/load/load_assembly.py
rename to server_addon/maya/client/ayon_maya/plugins/load/load_assembly.py
index 0fcbc6bd07..b37bf14101 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_assembly.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_assembly.py
@@ -5,9 +5,9 @@ from ayon_core.pipeline import (
     remove_container
 )
 
-from ayon_core.hosts.maya.api.pipeline import containerise
-from ayon_core.hosts.maya.api.lib import unique_namespace
-from ayon_core.hosts.maya.api import setdress
+from ayon_maya.api.pipeline import containerise
+from ayon_maya.api.lib import unique_namespace
+from ayon_maya.api import setdress
 
 
 class AssemblyLoader(load.LoaderPlugin):
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_audio.py b/server_addon/maya/client/ayon_maya/plugins/load/load_audio.py
similarity index 96%
rename from client/ayon_core/hosts/maya/plugins/load/load_audio.py
rename to server_addon/maya/client/ayon_maya/plugins/load/load_audio.py
index 228189f1a1..81e49c616e 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_audio.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_audio.py
@@ -4,8 +4,8 @@ from ayon_core.pipeline import (
     load,
     get_representation_path,
 )
-from ayon_core.hosts.maya.api.pipeline import containerise
-from ayon_core.hosts.maya.api.lib import unique_namespace, get_container_members
+from ayon_maya.api.pipeline import containerise
+from ayon_maya.api.lib import unique_namespace, get_container_members
 
 
 class AudioLoader(load.LoaderPlugin):
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_gpucache.py b/server_addon/maya/client/ayon_maya/plugins/load/load_gpucache.py
similarity index 94%
rename from client/ayon_core/hosts/maya/plugins/load/load_gpucache.py
rename to server_addon/maya/client/ayon_maya/plugins/load/load_gpucache.py
index 9832d2d657..fb6db94cee 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_gpucache.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_gpucache.py
@@ -1,13 +1,13 @@
 import maya.cmds as cmds
 
-from ayon_core.hosts.maya.api.pipeline import containerise
-from ayon_core.hosts.maya.api.lib import unique_namespace
+from ayon_maya.api.pipeline import containerise
+from ayon_maya.api.lib import unique_namespace
 from ayon_core.pipeline import (
     load,
     get_representation_path
 )
 from ayon_core.settings import get_project_settings
-from ayon_core.hosts.maya.api.plugin import get_load_color_for_product_type
+from ayon_maya.api.plugin import get_load_color_for_product_type
 
 
 class GpuCacheLoader(load.LoaderPlugin):
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_image.py b/server_addon/maya/client/ayon_maya/plugins/load/load_image.py
similarity index 99%
rename from client/ayon_core/hosts/maya/plugins/load/load_image.py
rename to server_addon/maya/client/ayon_maya/plugins/load/load_image.py
index 171920f747..28b44ac99c 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_image.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_image.py
@@ -13,8 +13,8 @@ from ayon_core.pipeline.colorspace import (
 )
 from ayon_core.settings import get_project_settings
 
-from ayon_core.hosts.maya.api.pipeline import containerise
-from ayon_core.hosts.maya.api.lib import (
+from ayon_maya.api.pipeline import containerise
+from ayon_maya.api.lib import (
     unique_namespace,
     namespaced
 )
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_image_plane.py b/server_addon/maya/client/ayon_maya/plugins/load/load_image_plane.py
similarity index 98%
rename from client/ayon_core/hosts/maya/plugins/load/load_image_plane.py
rename to server_addon/maya/client/ayon_maya/plugins/load/load_image_plane.py
index 15c7654c52..2740f106d6 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_image_plane.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_image_plane.py
@@ -4,8 +4,8 @@ from ayon_core.pipeline import (
     load,
     get_representation_path,
 )
-from ayon_core.hosts.maya.api.pipeline import containerise
-from ayon_core.hosts.maya.api.lib import (
+from ayon_maya.api.pipeline import containerise
+from ayon_maya.api.lib import (
     unique_namespace,
     namespaced,
     pairwise,
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_look.py b/server_addon/maya/client/ayon_maya/plugins/load/load_look.py
similarity index 96%
rename from client/ayon_core/hosts/maya/plugins/load/load_look.py
rename to server_addon/maya/client/ayon_maya/plugins/load/load_look.py
index af0e000dd2..f61d0e9c35 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_look.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_look.py
@@ -7,14 +7,14 @@ from qtpy import QtWidgets
 from ayon_api import get_representation_by_name
 
 from ayon_core.pipeline import get_representation_path
-import ayon_core.hosts.maya.api.plugin
-from ayon_core.hosts.maya.api import lib
-from ayon_core.hosts.maya.api.lib import get_reference_node
+import ayon_maya.api.plugin
+from ayon_maya.api import lib
+from ayon_maya.api.lib import get_reference_node
 
 from ayon_core.tools.utils import ScrollMessageBox
 
 
-class LookLoader(ayon_core.hosts.maya.api.plugin.ReferenceLoader):
+class LookLoader(ayon_maya.api.plugin.ReferenceLoader):
     """Specific loader for lookdev"""
 
     product_types = {"look"}
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_matchmove.py b/server_addon/maya/client/ayon_maya/plugins/load/load_matchmove.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/load/load_matchmove.py
rename to server_addon/maya/client/ayon_maya/plugins/load/load_matchmove.py
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_maya_usd.py b/server_addon/maya/client/ayon_maya/plugins/load/load_maya_usd.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/load/load_maya_usd.py
rename to server_addon/maya/client/ayon_maya/plugins/load/load_maya_usd.py
index 628a25e574..6c2945f4a8 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_maya_usd.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_maya_usd.py
@@ -6,11 +6,11 @@ from ayon_core.pipeline import (
     get_representation_path,
 )
 from ayon_core.pipeline.load import get_representation_path_from_context
-from ayon_core.hosts.maya.api.lib import (
+from ayon_maya.api.lib import (
     namespaced,
     unique_namespace
 )
-from ayon_core.hosts.maya.api.pipeline import containerise
+from ayon_maya.api.pipeline import containerise
 
 
 class MayaUsdLoader(load.LoaderPlugin):
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_multiverse_usd.py b/server_addon/maya/client/ayon_maya/plugins/load/load_multiverse_usd.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/load/load_multiverse_usd.py
rename to server_addon/maya/client/ayon_maya/plugins/load/load_multiverse_usd.py
index f32c76481d..93bb95092e 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_multiverse_usd.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_multiverse_usd.py
@@ -9,12 +9,12 @@ from ayon_core.pipeline import (
     load,
     get_representation_path
 )
-from ayon_core.hosts.maya.api.lib import (
+from ayon_maya.api.lib import (
     maintained_selection,
     namespaced,
     unique_namespace
 )
-from ayon_core.hosts.maya.api.pipeline import containerise
+from ayon_maya.api.pipeline import containerise
 
 
 class MultiverseUsdLoader(load.LoaderPlugin):
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_multiverse_usd_over.py b/server_addon/maya/client/ayon_maya/plugins/load/load_multiverse_usd_over.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/load/load_multiverse_usd_over.py
rename to server_addon/maya/client/ayon_maya/plugins/load/load_multiverse_usd_over.py
index b23fa48f07..e51353887e 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_multiverse_usd_over.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_multiverse_usd_over.py
@@ -10,10 +10,10 @@ from ayon_core.pipeline import (
     load,
     get_representation_path
 )
-from ayon_core.hosts.maya.api.lib import (
+from ayon_maya.api.lib import (
     maintained_selection
 )
-from ayon_core.hosts.maya.api.pipeline import containerise
+from ayon_maya.api.pipeline import containerise
 
 
 class MultiverseUsdOverLoader(load.LoaderPlugin):
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_redshift_proxy.py b/server_addon/maya/client/ayon_maya/plugins/load/load_redshift_proxy.py
similarity index 96%
rename from client/ayon_core/hosts/maya/plugins/load/load_redshift_proxy.py
rename to server_addon/maya/client/ayon_maya/plugins/load/load_redshift_proxy.py
index 7760d4081c..fba6314fec 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_redshift_proxy.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_redshift_proxy.py
@@ -10,13 +10,13 @@ from ayon_core.pipeline import (
     load,
     get_representation_path
 )
-from ayon_core.hosts.maya.api.lib import (
+from ayon_maya.api.lib import (
     namespaced,
     maintained_selection,
     unique_namespace
 )
-from ayon_core.hosts.maya.api.pipeline import containerise
-from ayon_core.hosts.maya.api.plugin import get_load_color_for_product_type
+from ayon_maya.api.pipeline import containerise
+from ayon_maya.api.plugin import get_load_color_for_product_type
 
 
 class RedshiftProxyLoader(load.LoaderPlugin):
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_reference.py b/server_addon/maya/client/ayon_maya/plugins/load/load_reference.py
similarity index 99%
rename from client/ayon_core/hosts/maya/plugins/load/load_reference.py
rename to server_addon/maya/client/ayon_maya/plugins/load/load_reference.py
index 847591bd11..4aad3ddb22 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_reference.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_reference.py
@@ -5,8 +5,8 @@ from maya import cmds
 import qargparse
 
 from ayon_core.settings import get_project_settings
-from ayon_core.hosts.maya.api import plugin
-from ayon_core.hosts.maya.api.lib import (
+from ayon_maya.api import plugin
+from ayon_maya.api.lib import (
     maintained_selection,
     get_container_members,
     parent_nodes,
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_rendersetup.py b/server_addon/maya/client/ayon_maya/plugins/load/load_rendersetup.py
similarity index 98%
rename from client/ayon_core/hosts/maya/plugins/load/load_rendersetup.py
rename to server_addon/maya/client/ayon_maya/plugins/load/load_rendersetup.py
index d5685b2c4c..96f38ba1ce 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_rendersetup.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_rendersetup.py
@@ -16,8 +16,8 @@ from ayon_core.pipeline import (
     load,
     get_representation_path
 )
-from ayon_core.hosts.maya.api import lib
-from ayon_core.hosts.maya.api.pipeline import containerise
+from ayon_maya.api import lib
+from ayon_maya.api.pipeline import containerise
 
 from maya import cmds
 import maya.app.renderSetup.model.renderSetup as renderSetup
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_arnold.py b/server_addon/maya/client/ayon_maya/plugins/load/load_vdb_to_arnold.py
similarity index 95%
rename from client/ayon_core/hosts/maya/plugins/load/load_vdb_to_arnold.py
rename to server_addon/maya/client/ayon_maya/plugins/load/load_vdb_to_arnold.py
index 5b0c78fd6f..d326c224bf 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_arnold.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_vdb_to_arnold.py
@@ -5,7 +5,7 @@ from ayon_core.pipeline import (
     load,
     get_representation_path
 )
-from ayon_core.hosts.maya.api.plugin import get_load_color_for_product_type
+from ayon_maya.api.plugin import get_load_color_for_product_type
 # TODO aiVolume doesn't automatically set velocity fps correctly, set manual?
 
 
@@ -22,8 +22,8 @@ class LoadVDBtoArnold(load.LoaderPlugin):
     def load(self, context, name, namespace, data):
 
         from maya import cmds
-        from ayon_core.hosts.maya.api.pipeline import containerise
-        from ayon_core.hosts.maya.api.lib import unique_namespace
+        from ayon_maya.api.pipeline import containerise
+        from ayon_maya.api.lib import unique_namespace
 
         product_type = context["product"]["productType"]
 
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_redshift.py b/server_addon/maya/client/ayon_maya/plugins/load/load_vdb_to_redshift.py
similarity index 95%
rename from client/ayon_core/hosts/maya/plugins/load/load_vdb_to_redshift.py
rename to server_addon/maya/client/ayon_maya/plugins/load/load_vdb_to_redshift.py
index e345a7bf6f..5ac8dfa05e 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_redshift.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_vdb_to_redshift.py
@@ -5,7 +5,7 @@ from ayon_core.pipeline import (
     load,
     get_representation_path
 )
-from ayon_core.hosts.maya.api.plugin import get_load_color_for_product_type
+from ayon_maya.api.plugin import get_load_color_for_product_type
 
 
 class LoadVDBtoRedShift(load.LoaderPlugin):
@@ -28,8 +28,8 @@ class LoadVDBtoRedShift(load.LoaderPlugin):
     def load(self, context, name=None, namespace=None, data=None):
 
         from maya import cmds
-        from ayon_core.hosts.maya.api.pipeline import containerise
-        from ayon_core.hosts.maya.api.lib import unique_namespace
+        from ayon_maya.api.pipeline import containerise
+        from ayon_maya.api.lib import unique_namespace
 
         product_type = context["product"]["productType"]
 
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_vray.py b/server_addon/maya/client/ayon_maya/plugins/load/load_vdb_to_vray.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/load/load_vdb_to_vray.py
rename to server_addon/maya/client/ayon_maya/plugins/load/load_vdb_to_vray.py
index d6d1c948b0..7a3129dfe7 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_vray.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_vdb_to_vray.py
@@ -5,7 +5,7 @@ from ayon_core.pipeline import (
     load,
     get_representation_path
 )
-from ayon_core.hosts.maya.api.plugin import get_load_color_for_product_type
+from ayon_maya.api.plugin import get_load_color_for_product_type
 
 from maya import cmds
 
@@ -86,8 +86,8 @@ class LoadVDBtoVRay(load.LoaderPlugin):
 
     def load(self, context, name, namespace, data):
 
-        from ayon_core.hosts.maya.api.lib import unique_namespace
-        from ayon_core.hosts.maya.api.pipeline import containerise
+        from ayon_maya.api.lib import unique_namespace
+        from ayon_maya.api.pipeline import containerise
 
         path = self.filepath_from_context(context)
         assert os.path.exists(path), (
@@ -159,7 +159,7 @@ class LoadVDBtoVRay(load.LoaderPlugin):
 
     def _set_path(self, grid_node, path, show_preset_popup=True):
 
-        from ayon_core.hosts.maya.api.lib import attribute_values
+        from ayon_maya.api.lib import attribute_values
         from maya import cmds
 
         def _get_filename_from_folder(path):
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_vrayproxy.py b/server_addon/maya/client/ayon_maya/plugins/load/load_vrayproxy.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/load/load_vrayproxy.py
rename to server_addon/maya/client/ayon_maya/plugins/load/load_vrayproxy.py
index 14d645021c..014c8fea48 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_vrayproxy.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_vrayproxy.py
@@ -15,13 +15,13 @@ from ayon_core.pipeline import (
     load,
     get_representation_path,
 )
-from ayon_core.hosts.maya.api.lib import (
+from ayon_maya.api.lib import (
     maintained_selection,
     namespaced,
     unique_namespace
 )
-from ayon_core.hosts.maya.api.pipeline import containerise
-from ayon_core.hosts.maya.api.plugin import get_load_color_for_product_type
+from ayon_maya.api.pipeline import containerise
+from ayon_maya.api.plugin import get_load_color_for_product_type
 
 
 class VRayProxyLoader(load.LoaderPlugin):
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_vrayscene.py b/server_addon/maya/client/ayon_maya/plugins/load/load_vrayscene.py
similarity index 96%
rename from client/ayon_core/hosts/maya/plugins/load/load_vrayscene.py
rename to server_addon/maya/client/ayon_maya/plugins/load/load_vrayscene.py
index ea3215da97..17b0c2cd44 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_vrayscene.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_vrayscene.py
@@ -5,13 +5,13 @@ from ayon_core.pipeline import (
     load,
     get_representation_path
 )
-from ayon_core.hosts.maya.api.lib import (
+from ayon_maya.api.lib import (
     maintained_selection,
     namespaced,
     unique_namespace
 )
-from ayon_core.hosts.maya.api.pipeline import containerise
-from ayon_core.hosts.maya.api.plugin import get_load_color_for_product_type
+from ayon_maya.api.pipeline import containerise
+from ayon_maya.api.plugin import get_load_color_for_product_type
 
 
 class VRaySceneLoader(load.LoaderPlugin):
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_xgen.py b/server_addon/maya/client/ayon_maya/plugins/load/load_xgen.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/load/load_xgen.py
rename to server_addon/maya/client/ayon_maya/plugins/load/load_xgen.py
index e2664439b0..f1f25640bd 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_xgen.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_xgen.py
@@ -6,18 +6,18 @@ import xgenm
 
 from qtpy import QtWidgets
 
-import ayon_core.hosts.maya.api.plugin
-from ayon_core.hosts.maya.api.lib import (
+import ayon_maya.api.plugin
+from ayon_maya.api.lib import (
     maintained_selection,
     get_container_members,
     attribute_values,
     write_xgen_file
 )
-from ayon_core.hosts.maya.api import current_file
+from ayon_maya.api import current_file
 from ayon_core.pipeline import get_representation_path
 
 
-class XgenLoader(ayon_core.hosts.maya.api.plugin.ReferenceLoader):
+class XgenLoader(ayon_maya.api.plugin.ReferenceLoader):
     """Load Xgen as reference"""
 
     product_types = {"xgen"}
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_yeti_cache.py b/server_addon/maya/client/ayon_maya/plugins/load/load_yeti_cache.py
similarity index 98%
rename from client/ayon_core/hosts/maya/plugins/load/load_yeti_cache.py
rename to server_addon/maya/client/ayon_maya/plugins/load/load_yeti_cache.py
index 4ca9ae9d03..bb7d2792c5 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_yeti_cache.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_yeti_cache.py
@@ -11,10 +11,10 @@ from ayon_core.pipeline import (
     load,
     get_representation_path
 )
-from ayon_core.hosts.maya.api import lib
-from ayon_core.hosts.maya.api.yeti import create_yeti_variable
-from ayon_core.hosts.maya.api.pipeline import containerise
-from ayon_core.hosts.maya.api.plugin import get_load_color_for_product_type
+from ayon_maya.api import lib
+from ayon_maya.api.yeti import create_yeti_variable
+from ayon_maya.api.pipeline import containerise
+from ayon_maya.api.plugin import get_load_color_for_product_type
 
 
 # Do not reset these values on update but only apply on first load
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_yeti_rig.py b/server_addon/maya/client/ayon_maya/plugins/load/load_yeti_rig.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/load/load_yeti_rig.py
rename to server_addon/maya/client/ayon_maya/plugins/load/load_yeti_rig.py
index 7444566ee1..41129b0245 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_yeti_rig.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_yeti_rig.py
@@ -2,8 +2,8 @@ from typing import List
 
 import maya.cmds as cmds
 
-from ayon_core.hosts.maya.api import plugin
-from ayon_core.hosts.maya.api import lib
+from ayon_maya.api import plugin
+from ayon_maya.api import lib
 
 from ayon_core.pipeline import registered_host
 from ayon_core.pipeline.create import CreateContext
diff --git a/client/ayon_core/hosts/maya/plugins/publish/__init__.py b/server_addon/maya/client/ayon_maya/plugins/publish/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/__init__.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/__init__.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_animation.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_animation.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_animation.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_animation.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_arnold_scene_source.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_arnold_scene_source.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_arnold_scene_source.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_arnold_scene_source.py
index fb71e128eb..cdeadd9036 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/collect_arnold_scene_source.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_arnold_scene_source.py
@@ -1,7 +1,7 @@
 from maya import cmds
 
 import pyblish.api
-from ayon_core.hosts.maya.api.lib import get_all_children
+from ayon_maya.api.lib import get_all_children
 
 
 class CollectArnoldSceneSource(pyblish.api.InstancePlugin):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_assembly.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_assembly.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_assembly.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_assembly.py
index eebbbd4447..affb22c530 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/collect_assembly.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_assembly.py
@@ -2,8 +2,8 @@ from collections import defaultdict
 import pyblish.api
 
 from maya import cmds, mel
-from ayon_core.hosts.maya import api
-from ayon_core.hosts.maya.api import lib
+from ayon_maya import api
+from ayon_maya.api import lib
 
 # TODO : Publish of assembly: -unique namespace for all assets, VALIDATOR!
 
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_current_file.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_current_file.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_current_file.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_current_file.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_fbx_animation.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_fbx_animation.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_fbx_animation.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_fbx_animation.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_fbx_camera.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_fbx_camera.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_fbx_camera.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_fbx_camera.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_file_dependencies.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_file_dependencies.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_file_dependencies.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_file_dependencies.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_gltf.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_gltf.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_gltf.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_gltf.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_history.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_history.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_history.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_history.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_inputs.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_inputs.py
similarity index 98%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_inputs.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_inputs.py
index fa5a694a76..28788ac50d 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/collect_inputs.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_inputs.py
@@ -5,8 +5,8 @@ import maya.api.OpenMaya as om
 import pyblish.api
 
 from ayon_core.pipeline import registered_host
-from ayon_core.hosts.maya.api.lib import get_container_members
-from ayon_core.hosts.maya.api.lib_rendersetup import get_shader_in_layer
+from ayon_maya.api.lib import get_container_members
+from ayon_maya.api.lib_rendersetup import get_shader_in_layer
 
 
 def iter_history(nodes,
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_instances.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_instances.py
similarity index 95%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_instances.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_instances.py
index 774c217cfd..758b977c8d 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/collect_instances.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_instances.py
@@ -1,7 +1,7 @@
 from maya import cmds
 
 import pyblish.api
-from ayon_core.hosts.maya.api.lib import get_all_children
+from ayon_maya.api.lib import get_all_children
 
 
 class CollectNewInstances(pyblish.api.InstancePlugin):
@@ -105,8 +105,10 @@ class CollectNewInstances(pyblish.api.InstancePlugin):
 
         parents = set()
         for node in nodes:
-            splitted = node.split("|")
-            items = ["|".join(splitted[0:i]) for i in range(2, len(splitted))]
+            split_parts = node.split("|")
+            items = [
+                "|".join(split_parts[:i]) for i in range(2, len(split_parts))
+            ]
             parents.update(items)
 
         return parents
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_look.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_look.py
similarity index 99%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_look.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_look.py
index a3a32bc0cb..f4bc26506b 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/collect_look.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_look.py
@@ -6,7 +6,7 @@ import glob
 
 from maya import cmds  # noqa
 import pyblish.api
-from ayon_core.hosts.maya.api import lib
+from ayon_maya.api import lib
 
 SHAPE_ATTRS = {"castsShadows",
                "receiveShadows",
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_maya_scene_time.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_maya_scene_time.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_maya_scene_time.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_maya_scene_time.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_maya_units.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_maya_units.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_maya_units.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_maya_units.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_maya_workspace.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_maya_workspace.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_maya_workspace.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_maya_workspace.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_model.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_model.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_model.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_model.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_multiverse_look.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_multiverse_look.py
similarity index 99%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_multiverse_look.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_multiverse_look.py
index 83e743c92e..9910936e7d 100644
--- a/client/ayon_core/hosts/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
 
 from maya import cmds
 import pyblish.api
-from ayon_core.hosts.maya.api import lib
+from ayon_maya.api import lib
 
 SHAPE_ATTRS = ["castsShadows",
                "receiveShadows",
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_pointcache.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_pointcache.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_pointcache.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_pointcache.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_remove_marked.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_remove_marked.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_remove_marked.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_remove_marked.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_render.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_render.py
similarity index 99%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_render.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_render.py
index 21095935a2..cacde15561 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/collect_render.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_render.py
@@ -42,11 +42,11 @@ import pyblish.api
 
 from ayon_core.pipeline import KnownPublishError
 from ayon_core.lib import get_formatted_current_time
-from ayon_core.hosts.maya.api.lib_renderproducts import (
+from ayon_maya.api.lib_renderproducts import (
     get as get_layer_render_products,
     UnsupportedRendererException
 )
-from ayon_core.hosts.maya.api import lib
+from ayon_maya.api import lib
 
 
 class CollectMayaRender(pyblish.api.InstancePlugin):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_render_layer_aovs.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_render_layer_aovs.py
similarity index 98%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_render_layer_aovs.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_render_layer_aovs.py
index 1c83918155..d23a4edb4d 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/collect_render_layer_aovs.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_render_layer_aovs.py
@@ -2,7 +2,7 @@ from maya import cmds
 
 import pyblish.api
 
-from ayon_core.hosts.maya.api import lib
+from ayon_maya.api import lib
 
 
 class CollectRenderLayerAOVS(pyblish.api.InstancePlugin):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_renderable_camera.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_renderable_camera.py
similarity index 92%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_renderable_camera.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_renderable_camera.py
index 97d857079b..d2d05971e9 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/collect_renderable_camera.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_renderable_camera.py
@@ -2,7 +2,7 @@ import pyblish.api
 
 from maya import cmds
 
-from ayon_core.hosts.maya.api.lib_rendersetup import get_attr_in_layer
+from ayon_maya.api.lib_rendersetup import get_attr_in_layer
 
 
 class CollectRenderableCamera(pyblish.api.InstancePlugin):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_review.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_review.py
similarity index 99%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_review.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_review.py
index 4e35b3bcc2..490e197ce0 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/collect_review.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_review.py
@@ -4,7 +4,7 @@ import ayon_api
 import pyblish.api
 
 from ayon_core.pipeline import KnownPublishError
-from ayon_core.hosts.maya.api import lib
+from ayon_maya.api import lib
 
 
 class CollectReview(pyblish.api.InstancePlugin):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_rig_sets.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_rig_sets.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_rig_sets.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_rig_sets.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_skeleton_mesh.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_skeleton_mesh.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_skeleton_mesh.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_skeleton_mesh.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_unreal_skeletalmesh.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_unreal_skeletalmesh.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_unreal_skeletalmesh.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_unreal_skeletalmesh.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_unreal_staticmesh.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_unreal_staticmesh.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_unreal_staticmesh.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_unreal_staticmesh.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_user_defined_attributes.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_user_defined_attributes.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_user_defined_attributes.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_user_defined_attributes.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_vrayproxy.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_vrayproxy.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_vrayproxy.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_vrayproxy.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_vrayscene.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_vrayscene.py
similarity index 99%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_vrayscene.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_vrayscene.py
index 9548cd9387..ea7064292b 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/collect_vrayscene.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_vrayscene.py
@@ -4,7 +4,7 @@
 import pyblish.api
 
 from ayon_core.lib import get_formatted_current_time
-from ayon_core.hosts.maya.api import lib
+from ayon_maya.api import lib
 
 
 class CollectVrayScene(pyblish.api.InstancePlugin):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_workfile.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_workfile.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_workfile.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_workfile.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_workscene_fps.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_workscene_fps.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_workscene_fps.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_workscene_fps.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_xgen.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_xgen.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_xgen.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_xgen.py
index f8f506376d..d09f60c827 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/collect_xgen.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_xgen.py
@@ -3,7 +3,7 @@ import os
 from maya import cmds
 
 import pyblish.api
-from ayon_core.hosts.maya.api.lib import get_attribute_input
+from ayon_maya.api.lib import get_attribute_input
 
 
 class CollectXgen(pyblish.api.InstancePlugin):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_yeti_cache.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_yeti_cache.py
similarity index 96%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_yeti_cache.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_yeti_cache.py
index e1755e4212..fa9670820f 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/collect_yeti_cache.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_yeti_cache.py
@@ -2,8 +2,8 @@ from maya import cmds
 
 import pyblish.api
 
-from ayon_core.hosts.maya.api import lib
-from ayon_core.hosts.maya.api.yeti import get_yeti_user_variables
+from ayon_maya.api import lib
+from ayon_maya.api.yeti import get_yeti_user_variables
 
 
 SETTINGS = {
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_yeti_rig.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_yeti_rig.py
similarity index 99%
rename from client/ayon_core/hosts/maya/plugins/publish/collect_yeti_rig.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_yeti_rig.py
index 8964e17f14..95e6afdb01 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/collect_yeti_rig.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_yeti_rig.py
@@ -5,7 +5,7 @@ from maya import cmds
 
 import pyblish.api
 
-from ayon_core.hosts.maya.api import lib
+from ayon_maya.api import lib
 from ayon_core.pipeline.publish import KnownPublishError
 
 
diff --git a/client/ayon_core/hosts/maya/plugins/publish/determine_future_version.py b/server_addon/maya/client/ayon_maya/plugins/publish/determine_future_version.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/determine_future_version.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/determine_future_version.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_active_view_thumbnail.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_active_view_thumbnail.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_active_view_thumbnail.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_active_view_thumbnail.py
index b5054b4846..777bc2000a 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_active_view_thumbnail.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_active_view_thumbnail.py
@@ -4,7 +4,7 @@ import maya.api.OpenMayaUI as omui
 import pyblish.api
 import tempfile
 
-from ayon_core.hosts.maya.api.lib import IS_HEADLESS
+from ayon_maya.api.lib import IS_HEADLESS
 
 
 class ExtractActiveViewThumbnail(pyblish.api.InstancePlugin):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_arnold_scene_source.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_arnold_scene_source.py
similarity index 99%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_arnold_scene_source.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_arnold_scene_source.py
index fb4c41f1de..2829420ae1 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_arnold_scene_source.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_arnold_scene_source.py
@@ -6,7 +6,7 @@ from maya import cmds
 import arnold
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.maya.api import lib
+from ayon_maya.api import lib
 
 
 class ExtractArnoldSceneSource(publish.Extractor):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_assembly.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_assembly.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_assembly.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_assembly.py
index 5f51dc38cb..df390c0798 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_assembly.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_assembly.py
@@ -2,7 +2,7 @@ import os
 import json
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.maya.api.alembic import extract_alembic
+from ayon_maya.api.alembic import extract_alembic
 
 from maya import cmds
 
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_camera_alembic.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_camera_alembic.py
similarity index 99%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_camera_alembic.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_camera_alembic.py
index 74abc8de75..e36f964abd 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_camera_alembic.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_camera_alembic.py
@@ -4,7 +4,7 @@ import json
 from maya import cmds
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.maya.api import lib
+from ayon_maya.api import lib
 
 
 class ExtractCameraAlembic(publish.Extractor,
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_camera_mayaScene.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_camera_mayaScene.py
similarity index 99%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_camera_mayaScene.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_camera_mayaScene.py
index cb3951ec0c..62ce0a1806 100644
--- a/client/ayon_core/hosts/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 contextlib
 from maya import cmds
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.maya.api import lib
+from ayon_maya.api import lib
 from ayon_core.lib import (
     BoolDef
 )
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_fbx.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_fbx.py
similarity index 94%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_fbx.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_fbx.py
index bb2a6dad07..d6a1de8455 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_fbx.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_fbx.py
@@ -6,8 +6,8 @@ import maya.mel as mel  # noqa
 import pyblish.api
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.maya.api.lib import maintained_selection
-from ayon_core.hosts.maya.api import fbx
+from ayon_maya.api.lib import maintained_selection
+from ayon_maya.api import fbx
 
 
 class ExtractFBX(publish.Extractor):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_fbx_animation.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_fbx_animation.py
similarity index 96%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_fbx_animation.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_fbx_animation.py
index 77b5b79b5f..92ba0be953 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_fbx_animation.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_fbx_animation.py
@@ -5,8 +5,8 @@ from maya import cmds  # noqa
 import pyblish.api
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.maya.api import fbx
-from ayon_core.hosts.maya.api.lib import (
+from ayon_maya.api import fbx
+from ayon_maya.api.lib import (
     namespaced, get_namespace, strip_namespace
 )
 
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_gltf.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_gltf.py
similarity index 93%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_gltf.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_gltf.py
index ff11bf0c1f..1472454af7 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_gltf.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_gltf.py
@@ -4,8 +4,8 @@ from maya import cmds, mel
 import pyblish.api
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.maya.api import lib
-from ayon_core.hosts.maya.api.gltf import extract_gltf
+from ayon_maya.api import lib
+from ayon_maya.api.gltf import extract_gltf
 
 
 class ExtractGLB(publish.Extractor):
@@ -39,7 +39,7 @@ class ExtractGLB(publish.Extractor):
             "aet": end_frame,
             "afr": fps,
             "dsa": 1,
-            "acn": instance.name,
+            "acn": instance.name,  # codespell:ignore acn
             "glb": True,
             "vno": True    # visibleNodeOnly
         }
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_gpu_cache.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_gpu_cache.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_gpu_cache.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_gpu_cache.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_import_reference.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_import_reference.py
similarity index 99%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_import_reference.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_import_reference.py
index 3fb84c8d83..e461499d88 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_import_reference.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_import_reference.py
@@ -9,7 +9,7 @@ import tempfile
 from ayon_core.lib import run_subprocess
 from ayon_core.pipeline import publish
 from ayon_core.pipeline.publish import OptionalPyblishPluginMixin
-from ayon_core.hosts.maya.api import lib
+from ayon_maya.api import lib
 
 
 class ExtractImportReference(publish.Extractor,
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_layout.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_layout.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_layout.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_layout.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_look.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_look.py
similarity index 99%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_look.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_look.py
index 2a86b20131..f6b5e7d5a8 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_look.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_look.py
@@ -25,7 +25,7 @@ from ayon_core.lib import (
 )
 
 from ayon_core.pipeline import publish, KnownPublishError
-from ayon_core.hosts.maya.api import lib
+from ayon_maya.api import lib
 
 # Modes for transfer
 COPY = 1
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_maya_scene_raw.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_maya_scene_raw.py
similarity index 98%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_maya_scene_raw.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_maya_scene_raw.py
index 2fd4f44449..bc0a9afd97 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_maya_scene_raw.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_maya_scene_raw.py
@@ -4,7 +4,7 @@ import os
 
 from maya import cmds
 
-from ayon_core.hosts.maya.api.lib import maintained_selection
+from ayon_maya.api.lib import maintained_selection
 from ayon_core.pipeline import (
     AYON_CONTAINER_ID,
     AVALON_CONTAINER_ID,
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_maya_usd.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_maya_usd.py
similarity index 99%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_maya_usd.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_maya_usd.py
index cfaea8e479..b6f6529ca5 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_maya_usd.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_maya_usd.py
@@ -7,7 +7,7 @@ from maya import cmds
 
 import pyblish.api
 from ayon_core.pipeline import publish
-from ayon_core.hosts.maya.api.lib import maintained_selection
+from ayon_maya.api.lib import maintained_selection
 
 
 @contextlib.contextmanager
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_model.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_model.py
similarity index 99%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_model.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_model.py
index 543af59e8f..b439d05a1a 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_model.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_model.py
@@ -5,7 +5,7 @@ import os
 from maya import cmds
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.maya.api import lib
+from ayon_maya.api import lib
 
 
 class ExtractModel(publish.Extractor,
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_look.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_look.py
similarity index 98%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_look.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_look.py
index 2dd8821b3a..d69c179712 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_look.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_look.py
@@ -3,7 +3,7 @@ import os
 from maya import cmds
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.maya.api.lib import maintained_selection
+from ayon_maya.api.lib import maintained_selection
 
 
 class ExtractMultiverseLook(publish.Extractor):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_usd.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_usd.py
similarity index 99%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_usd.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_usd.py
index 8c195c25fd..a787093648 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_usd.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_usd.py
@@ -6,7 +6,7 @@ from maya import mel
 
 import pyblish.api
 from ayon_core.pipeline import publish
-from ayon_core.hosts.maya.api.lib import maintained_selection
+from ayon_maya.api.lib import maintained_selection
 
 
 class ExtractMultiverseUsd(publish.Extractor):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_usd_comp.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_usd_comp.py
similarity index 99%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_usd_comp.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_usd_comp.py
index d31660d1b4..eac150ec1a 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_usd_comp.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_usd_comp.py
@@ -3,7 +3,7 @@ import os
 from maya import cmds
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.maya.api.lib import maintained_selection
+from ayon_maya.api.lib import maintained_selection
 
 
 class ExtractMultiverseUsdComposition(publish.Extractor):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_usd_over.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_usd_over.py
similarity index 98%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_usd_over.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_usd_over.py
index 00303e604c..d1e806da9f 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_usd_over.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_usd_over.py
@@ -1,7 +1,7 @@
 import os
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.maya.api.lib import maintained_selection
+from ayon_maya.api.lib import maintained_selection
 
 from maya import cmds
 
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_obj.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_obj.py
similarity index 98%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_obj.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_obj.py
index 6ce40a8728..16204b6008 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_obj.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_obj.py
@@ -4,7 +4,7 @@ import os
 from maya import cmds
 import pyblish.api
 from ayon_core.pipeline import publish
-from ayon_core.hosts.maya.api import lib
+from ayon_maya.api import lib
 
 
 class ExtractObj(publish.Extractor):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_playblast.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_playblast.py
similarity index 98%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_playblast.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_playblast.py
index a394d880ff..8a94b24e3a 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_playblast.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_playblast.py
@@ -3,7 +3,7 @@ import os
 import clique
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.maya.api import lib
+from ayon_maya.api import lib
 
 from maya import cmds
 
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_pointcache.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_pointcache.py
similarity index 99%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_pointcache.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_pointcache.py
index cc930e49cc..04a895ff41 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_pointcache.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_pointcache.py
@@ -4,8 +4,8 @@ from collections import OrderedDict
 from maya import cmds
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.maya.api.alembic import extract_alembic
-from ayon_core.hosts.maya.api.lib import (
+from ayon_maya.api.alembic import extract_alembic
+from ayon_maya.api.lib import (
     get_all_children,
     suspended_refresh,
     maintained_selection,
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_proxy_abc.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_proxy_abc.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_proxy_abc.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_proxy_abc.py
index 5aefdfc33a..dd15622f5f 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_proxy_abc.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_proxy_abc.py
@@ -3,8 +3,8 @@ import os
 from maya import cmds
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.maya.api.alembic import extract_alembic
-from ayon_core.hosts.maya.api.lib import (
+from ayon_maya.api.alembic import extract_alembic
+from ayon_maya.api.lib import (
     suspended_refresh,
     maintained_selection,
     iter_visible_nodes_in_range
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_redshift_proxy.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_redshift_proxy.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_redshift_proxy.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_redshift_proxy.py
index 66dd805437..9d0f4085a3 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_redshift_proxy.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_redshift_proxy.py
@@ -5,11 +5,11 @@ import os
 from maya import cmds
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.maya.api.lib import (
+from ayon_maya.api.lib import (
     maintained_selection,
     renderlayer
 )
-from ayon_core.hosts.maya.api.render_setup_tools import (
+from ayon_maya.api.render_setup_tools import (
     allow_export_from_render_setup_layer
 )
 
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_rendersetup.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_rendersetup.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_rendersetup.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_rendersetup.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_rig.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_rig.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_rig.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_rig.py
index 305f4698c6..58e4373d74 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_rig.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_rig.py
@@ -5,7 +5,7 @@ import os
 from maya import cmds
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.maya.api.lib import maintained_selection
+from ayon_maya.api.lib import maintained_selection
 
 
 class ExtractRig(publish.Extractor):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_skeleton_mesh.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_skeleton_mesh.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_skeleton_mesh.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_skeleton_mesh.py
index a6811d6a6f..76e49d1588 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_skeleton_mesh.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_skeleton_mesh.py
@@ -6,7 +6,7 @@ import pyblish.api
 
 from ayon_core.pipeline import publish
 from ayon_core.pipeline.publish import OptionalPyblishPluginMixin
-from ayon_core.hosts.maya.api import fbx
+from ayon_maya.api import fbx
 
 
 class ExtractSkeletonMesh(publish.Extractor,
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_thumbnail.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_thumbnail.py
similarity index 99%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_thumbnail.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_thumbnail.py
index d3140487a6..2863e4460b 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_thumbnail.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_thumbnail.py
@@ -3,7 +3,7 @@ import glob
 import tempfile
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.maya.api import lib
+from ayon_maya.api import lib
 
 
 class ExtractThumbnail(publish.Extractor):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_skeletalmesh_abc.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_skeletalmesh_abc.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_unreal_skeletalmesh_abc.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_skeletalmesh_abc.py
index b5cc7745a1..f0096e37e3 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_skeletalmesh_abc.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_skeletalmesh_abc.py
@@ -5,8 +5,8 @@ import os
 from maya import cmds  # noqa
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.maya.api.alembic import extract_alembic
-from ayon_core.hosts.maya.api.lib import (
+from ayon_maya.api.alembic import extract_alembic
+from ayon_maya.api.lib import (
     suspended_refresh,
     maintained_selection
 )
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_skeletalmesh_fbx.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_skeletalmesh_fbx.py
similarity index 98%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_unreal_skeletalmesh_fbx.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_skeletalmesh_fbx.py
index 6292afcf41..95e12795de 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_skeletalmesh_fbx.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_skeletalmesh_fbx.py
@@ -8,7 +8,7 @@ from maya import cmds  # noqa
 import pyblish.api
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.maya.api import fbx
+from ayon_maya.api import fbx
 
 
 @contextmanager
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_staticmesh.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_staticmesh.py
similarity index 95%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_unreal_staticmesh.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_staticmesh.py
index 9cf8a543f4..140a4e4147 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_staticmesh.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_staticmesh.py
@@ -7,11 +7,11 @@ from maya import cmds  # noqa
 import pyblish.api
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.maya.api.lib import (
+from ayon_maya.api.lib import (
     parent_nodes,
     maintained_selection
 )
-from ayon_core.hosts.maya.api import fbx
+from ayon_maya.api import fbx
 
 
 class ExtractUnrealStaticMesh(publish.Extractor):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_yeticache.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_yeticache.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_unreal_yeticache.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_yeticache.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_vrayproxy.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_vrayproxy.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_vrayproxy.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_vrayproxy.py
index d16f9e8701..581195c5da 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_vrayproxy.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_vrayproxy.py
@@ -3,7 +3,7 @@ import os
 from maya import cmds
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.maya.api.lib import maintained_selection
+from ayon_maya.api.lib import maintained_selection
 
 
 class ExtractVRayProxy(publish.Extractor):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_vrayscene.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_vrayscene.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_vrayscene.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_vrayscene.py
index 023a15e67a..d55c0ddef6 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_vrayscene.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_vrayscene.py
@@ -4,8 +4,8 @@ import os
 import re
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.maya.api.render_setup_tools import export_in_rs_layer
-from ayon_core.hosts.maya.api.lib import maintained_selection
+from ayon_maya.api.render_setup_tools import export_in_rs_layer
+from ayon_maya.api.lib import maintained_selection
 
 from maya import cmds
 
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_workfile_xgen.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_workfile_xgen.py
similarity index 99%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_workfile_xgen.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_workfile_xgen.py
index 54d295b479..227c16d62a 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_workfile_xgen.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_workfile_xgen.py
@@ -5,7 +5,7 @@ import copy
 from maya import cmds
 
 import pyblish.api
-from ayon_core.hosts.maya.api.alembic import extract_alembic
+from ayon_maya.api.alembic import extract_alembic
 from ayon_core.pipeline import publish
 
 
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_xgen.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_xgen.py
similarity index 99%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_xgen.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_xgen.py
index b672089a63..61cad1dc33 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_xgen.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_xgen.py
@@ -6,7 +6,7 @@ from maya import cmds
 import xgenm
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.maya.api.lib import (
+from ayon_maya.api.lib import (
     maintained_selection, attribute_values, write_xgen_file, delete_after
 )
 
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_yeti_cache.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_yeti_cache.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_yeti_cache.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_yeti_cache.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_yeti_rig.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_yeti_rig.py
similarity index 99%
rename from client/ayon_core/hosts/maya/plugins/publish/extract_yeti_rig.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_yeti_rig.py
index 0b67117ebc..8ef43fbf13 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_yeti_rig.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_yeti_rig.py
@@ -8,7 +8,7 @@ import contextlib
 from maya import cmds
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.maya.api import lib
+from ayon_maya.api import lib
 
 
 @contextlib.contextmanager
diff --git a/client/ayon_core/hosts/maya/plugins/publish/help/submit_maya_remote_publish_deadline.xml b/server_addon/maya/client/ayon_maya/plugins/publish/help/submit_maya_remote_publish_deadline.xml
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/publish/help/submit_maya_remote_publish_deadline.xml
rename to server_addon/maya/client/ayon_maya/plugins/publish/help/submit_maya_remote_publish_deadline.xml
index e92320ccdc..fa908fe425 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/help/submit_maya_remote_publish_deadline.xml
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/help/submit_maya_remote_publish_deadline.xml
@@ -13,4 +13,4 @@ Check all failing plugins (should be highlighted in red) and fix issues if possi
 </description>
 
 </error>
-</root>
\ No newline at end of file
+</root>
diff --git a/client/ayon_core/hosts/maya/plugins/publish/help/validate_animation_out_set_related_node_ids.xml b/server_addon/maya/client/ayon_maya/plugins/publish/help/validate_animation_out_set_related_node_ids.xml
similarity index 90%
rename from client/ayon_core/hosts/maya/plugins/publish/help/validate_animation_out_set_related_node_ids.xml
rename to server_addon/maya/client/ayon_maya/plugins/publish/help/validate_animation_out_set_related_node_ids.xml
index a855dd90a5..cdaf97b8f4 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/help/validate_animation_out_set_related_node_ids.xml
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/help/validate_animation_out_set_related_node_ids.xml
@@ -6,13 +6,13 @@
 
 Meshes are detected where the (deformed) mesh has a different `cbId` than
 the same mesh in its deformation history.
-Theses should normally be the same.
+These should normally be the same.
 
 ### How to repair?
 
 By using the repair action the IDs from the shape in history will be
 copied to the deformed shape. For **animation** instances using the
-repair action usually is usually the correct fix.
+repair action is usually the correct fix.
 
 </description>
 <detail>
diff --git a/client/ayon_core/hosts/maya/plugins/publish/help/validate_maya_units.xml b/server_addon/maya/client/ayon_maya/plugins/publish/help/validate_maya_units.xml
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/help/validate_maya_units.xml
rename to server_addon/maya/client/ayon_maya/plugins/publish/help/validate_maya_units.xml
diff --git a/client/ayon_core/hosts/maya/plugins/publish/help/validate_mesh_non_manifold.xml b/server_addon/maya/client/ayon_maya/plugins/publish/help/validate_mesh_non_manifold.xml
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/help/validate_mesh_non_manifold.xml
rename to server_addon/maya/client/ayon_maya/plugins/publish/help/validate_mesh_non_manifold.xml
diff --git a/client/ayon_core/hosts/maya/plugins/publish/help/validate_node_ids.xml b/server_addon/maya/client/ayon_maya/plugins/publish/help/validate_node_ids.xml
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/help/validate_node_ids.xml
rename to server_addon/maya/client/ayon_maya/plugins/publish/help/validate_node_ids.xml
diff --git a/client/ayon_core/hosts/maya/plugins/publish/help/validate_rig_out_set_node_ids.xml b/server_addon/maya/client/ayon_maya/plugins/publish/help/validate_rig_out_set_node_ids.xml
similarity index 96%
rename from client/ayon_core/hosts/maya/plugins/publish/help/validate_rig_out_set_node_ids.xml
rename to server_addon/maya/client/ayon_maya/plugins/publish/help/validate_rig_out_set_node_ids.xml
index 374b8e59ae..956a7adb3b 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/help/validate_rig_out_set_node_ids.xml
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/help/validate_rig_out_set_node_ids.xml
@@ -6,7 +6,7 @@
 
 Meshes are detected in the **rig** where the (deformed) mesh has a different
 `cbId` than the same mesh in its deformation history.
-Theses should normally be the same.
+These should normally be the same.
 
 ### How to repair?
 
diff --git a/client/ayon_core/hosts/maya/plugins/publish/help/validate_skeletalmesh_hierarchy.xml b/server_addon/maya/client/ayon_maya/plugins/publish/help/validate_skeletalmesh_hierarchy.xml
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/help/validate_skeletalmesh_hierarchy.xml
rename to server_addon/maya/client/ayon_maya/plugins/publish/help/validate_skeletalmesh_hierarchy.xml
diff --git a/client/ayon_core/hosts/maya/plugins/publish/increment_current_file_deadline.py b/server_addon/maya/client/ayon_maya/plugins/publish/increment_current_file_deadline.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/increment_current_file_deadline.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/increment_current_file_deadline.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/reset_xgen_attributes.py b/server_addon/maya/client/ayon_maya/plugins/publish/reset_xgen_attributes.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/reset_xgen_attributes.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/reset_xgen_attributes.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/save_scene.py b/server_addon/maya/client/ayon_maya/plugins/publish/save_scene.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/save_scene.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/save_scene.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_alembic_options_defaults.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_alembic_options_defaults.py
similarity index 95%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_alembic_options_defaults.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_alembic_options_defaults.py
index 11f4c313fa..bd69e7a3cd 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_alembic_options_defaults.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_alembic_options_defaults.py
@@ -54,8 +54,8 @@ class ValidateAlembicDefaultsPointcache(
 
             default_value = settings[key]
 
-            # Lists are best to compared sorted since we cant rely on the order
-            # of the items.
+            # Lists are best to compared sorted since we can't rely on
+            # the order of the items.
             if isinstance(value, list):
                 value = sorted(value)
                 default_value = sorted(default_value)
@@ -79,15 +79,15 @@ class ValidateAlembicDefaultsPointcache(
     def get_description():
         return inspect.cleandoc(
             """### Alembic Extract settings differ from defaults
-            
-            The alembic export options differ from the project default values. 
-            
-            If this is intentional you can disable this validation by 
+
+            The alembic export options differ from the project default values.
+
+            If this is intentional you can disable this validation by
             disabling **Validate Alembic Options Default**.
-            
+
             If not you may use the "Repair" action to revert all the options to
             their default values.
-            
+
             """
         )
 
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_animation_content.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_animation_content.py
similarity index 94%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_animation_content.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_animation_content.py
index ea989bbcf3..17b9bf4e85 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_animation_content.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_animation_content.py
@@ -1,5 +1,5 @@
 import pyblish.api
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder,
@@ -20,7 +20,7 @@ class ValidateAnimationContent(pyblish.api.InstancePlugin,
     hosts = ["maya"]
     families = ["animation"]
     label = "Animation Content"
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
     optional = False
 
     @classmethod
diff --git a/client/ayon_core/hosts/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
similarity index 96%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_animation_out_set_related_node_ids.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_animation_out_set_related_node_ids.py
index 7ecd602662..6d53608fb2 100644
--- a/client/ayon_core/hosts/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
@@ -1,8 +1,8 @@
 import maya.cmds as cmds
 
 import pyblish.api
-import ayon_core.hosts.maya.api.action
-from ayon_core.hosts.maya.api import lib
+import ayon_maya.api.action
+from ayon_maya.api import lib
 from ayon_core.pipeline.publish import (
     RepairAction,
     ValidateContentsOrder,
@@ -29,7 +29,7 @@ class ValidateOutRelatedNodeIds(pyblish.api.InstancePlugin,
     hosts = ['maya']
     label = 'Animation Out Set Related Node Ids'
     actions = [
-        ayon_core.hosts.maya.api.action.SelectInvalidAction,
+        ayon_maya.api.action.SelectInvalidAction,
         RepairAction
     ]
     optional = False
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_arnold_scene_source.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_arnold_scene_source.py
similarity index 98%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_arnold_scene_source.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_arnold_scene_source.py
index 8574b3ecc8..43c7b99ece 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_arnold_scene_source.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_arnold_scene_source.py
@@ -5,7 +5,7 @@ import pyblish.api
 from ayon_core.pipeline.publish import (
     ValidateContentsOrder, PublishValidationError
 )
-from ayon_core.hosts.maya.api.lib import is_visible
+from ayon_maya.api.lib import is_visible
 
 
 class ValidateArnoldSceneSource(pyblish.api.InstancePlugin):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_arnold_scene_source_cbid.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_arnold_scene_source_cbid.py
similarity index 98%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_arnold_scene_source_cbid.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_arnold_scene_source_cbid.py
index e5dbe178fc..546d65e84c 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_arnold_scene_source_cbid.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_arnold_scene_source_cbid.py
@@ -1,5 +1,5 @@
 import pyblish.api
-from ayon_core.hosts.maya.api import lib
+from ayon_maya.api import lib
 from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
     PublishValidationError,
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_ass_relative_paths.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_ass_relative_paths.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_ass_relative_paths.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_ass_relative_paths.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_assembly_name.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_assembly_name.py
similarity index 94%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_assembly_name.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_assembly_name.py
index c829f4bf74..c5ac22dd84 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_assembly_name.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_assembly_name.py
@@ -1,6 +1,6 @@
 import pyblish.api
 import maya.cmds as cmds
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     PublishValidationError,
     OptionalPyblishPluginMixin
@@ -17,7 +17,7 @@ class ValidateAssemblyName(pyblish.api.InstancePlugin,
     label = "Validate Assembly Name"
     order = pyblish.api.ValidatorOrder
     families = ["assembly"]
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
     active = False
     optional = True
 
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_assembly_namespaces.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_assembly_namespaces.py
similarity index 92%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_assembly_namespaces.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_assembly_namespaces.py
index 814a8295c4..51b9485999 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_assembly_namespaces.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_assembly_namespaces.py
@@ -1,5 +1,5 @@
 import pyblish.api
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     PublishValidationError,
     OptionalPyblishPluginMixin
@@ -21,7 +21,7 @@ class ValidateAssemblyNamespaces(pyblish.api.InstancePlugin,
     label = "Validate Assembly Namespaces"
     order = pyblish.api.ValidatorOrder
     families = ["assembly"]
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
     optional = False
 
     def process(self, instance):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_assembly_transforms.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_assembly_transforms.py
similarity index 94%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_assembly_transforms.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_assembly_transforms.py
index 3bcae5de49..c5f0b6fd65 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_assembly_transforms.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_assembly_transforms.py
@@ -1,7 +1,7 @@
 import pyblish.api
 from maya import cmds
 
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     PublishValidationError,
     RepairAction,
@@ -32,7 +32,7 @@ class ValidateAssemblyModelTransforms(pyblish.api.InstancePlugin,
     order = pyblish.api.ValidatorOrder + 0.49
     label = "Assembly Model Transforms"
     families = ["assembly"]
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction,
+    actions = [ayon_maya.api.action.SelectInvalidAction,
                RepairAction]
 
     prompt_message = ("You are about to reset the matrix to the default values."
@@ -53,7 +53,7 @@ class ValidateAssemblyModelTransforms(pyblish.api.InstancePlugin,
     @classmethod
     def get_invalid(cls, instance):
 
-        from ayon_core.hosts.maya.api import lib
+        from ayon_maya.api import lib
 
         # Get all transforms in the loaded containers
         container_roots = cmds.listRelatives(instance.data["nodesHierarchy"],
@@ -100,7 +100,7 @@ class ValidateAssemblyModelTransforms(pyblish.api.InstancePlugin,
 
         from qtpy import QtWidgets
 
-        from ayon_core.hosts.maya.api import lib
+        from ayon_maya.api import lib
 
         # Store namespace in variable, cosmetics thingy
         choice = QtWidgets.QMessageBox.warning(
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_attributes.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_attributes.py
similarity index 98%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_attributes.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_attributes.py
index 1514972159..08620e22bf 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_attributes.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_attributes.py
@@ -4,7 +4,7 @@ from collections import defaultdict
 import pyblish.api
 from maya import cmds
 
-from ayon_core.hosts.maya.api.lib import set_attribute
+from ayon_maya.api.lib import set_attribute
 from ayon_core.pipeline.publish import (
     OptionalPyblishPluginMixin, PublishValidationError, RepairAction,
     ValidateContentsOrder)
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_camera_attributes.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_camera_attributes.py
similarity index 95%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_camera_attributes.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_camera_attributes.py
index 5fd8772a96..95d1e76b83 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_camera_attributes.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_camera_attributes.py
@@ -1,7 +1,7 @@
 import pyblish.api
 from maya import cmds
 
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder,
@@ -23,7 +23,7 @@ class ValidateCameraAttributes(pyblish.api.InstancePlugin,
     families = ['camera']
     hosts = ['maya']
     label = 'Camera Attributes'
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
     optional = True
 
     DEFAULTS = [
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_camera_contents.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_camera_contents.py
similarity index 96%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_camera_contents.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_camera_contents.py
index 0f14a057f9..3ce512aebc 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_camera_contents.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_camera_contents.py
@@ -1,7 +1,7 @@
 import pyblish.api
 from maya import cmds
 
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder,
@@ -23,7 +23,7 @@ class ValidateCameraContents(pyblish.api.InstancePlugin,
     families = ['camera']
     hosts = ['maya']
     label = 'Camera Contents'
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
     validate_shapes = True
     optional = False
 
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_color_sets.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_color_sets.py
similarity index 94%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_color_sets.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_color_sets.py
index f70b46f89e..40d7297444 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_color_sets.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_color_sets.py
@@ -1,7 +1,7 @@
 from maya import cmds
 
 import pyblish.api
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     ValidateMeshOrder,
     OptionalPyblishPluginMixin,
@@ -24,7 +24,7 @@ class ValidateColorSets(pyblish.api.InstancePlugin,
     families = ['model']
     label = 'Mesh ColorSets'
     actions = [
-        ayon_core.hosts.maya.api.action.SelectInvalidAction, RepairAction
+        ayon_maya.api.action.SelectInvalidAction, RepairAction
     ]
     optional = True
 
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_current_renderlayer_renderable.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_current_renderlayer_renderable.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_current_renderlayer_renderable.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_current_renderlayer_renderable.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_cycle_error.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_cycle_error.py
similarity index 86%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_cycle_error.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_cycle_error.py
index f969ff533b..ac773a586a 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_cycle_error.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_cycle_error.py
@@ -1,8 +1,8 @@
 import pyblish.api
 from maya import cmds
 
-import ayon_core.hosts.maya.api.action
-from ayon_core.hosts.maya.api.lib import maintained_selection
+import ayon_maya.api.action
+from ayon_maya.api.lib import maintained_selection
 from ayon_core.pipeline.publish import (
     OptionalPyblishPluginMixin, PublishValidationError, ValidateContentsOrder)
 
@@ -15,7 +15,7 @@ class ValidateCycleError(pyblish.api.InstancePlugin,
     label = "Cycle Errors"
     hosts = ["maya"]
     families = ["rig"]
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
     optional = True
 
     def process(self, instance):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_frame_range.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_frame_range.py
similarity index 99%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_frame_range.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_frame_range.py
index 5736e726e9..20feee8756 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_frame_range.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_frame_range.py
@@ -7,7 +7,7 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     OptionalPyblishPluginMixin
 )
-from ayon_core.hosts.maya.api.lib_rendersetup import (
+from ayon_maya.api.lib_rendersetup import (
     get_attr_overrides,
     get_attr_in_layer,
 )
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_glsl_material.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_glsl_material.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_glsl_material.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_glsl_material.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_glsl_plugin.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_glsl_plugin.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_glsl_plugin.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_glsl_plugin.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_instance_has_members.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_instance_has_members.py
similarity index 91%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_instance_has_members.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_instance_has_members.py
index 16e04af446..de20a7c150 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_instance_has_members.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_instance_has_members.py
@@ -1,5 +1,5 @@
 import pyblish.api
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
     PublishValidationError
@@ -12,7 +12,7 @@ class ValidateInstanceHasMembers(pyblish.api.InstancePlugin):
     order = ValidateContentsOrder
     hosts = ["maya"]
     label = 'Instance has members'
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
 
     @classmethod
     def get_invalid(cls, instance):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_instance_in_context.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_instance_in_context.py
similarity index 96%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_instance_in_context.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_instance_in_context.py
index e6f4b908bb..f67845bcd5 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_instance_in_context.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_instance_in_context.py
@@ -3,7 +3,7 @@
 from __future__ import absolute_import
 
 import pyblish.api
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     RepairAction,
     ValidateContentsOrder,
@@ -28,7 +28,7 @@ class ValidateInstanceInContext(pyblish.api.InstancePlugin,
     optional = True
     hosts = ["maya"]
     actions = [
-        ayon_core.hosts.maya.api.action.SelectInvalidAction, RepairAction
+        ayon_maya.api.action.SelectInvalidAction, RepairAction
     ]
 
     def process(self, instance):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_instance_subset.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_instance_subset.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_instance_subset.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_instance_subset.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_loaded_plugin.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_loaded_plugin.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_loaded_plugin.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_loaded_plugin.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_look_contents.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_contents.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_look_contents.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_look_contents.py
index a8d8ec373a..4709a7bb1e 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_look_contents.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_contents.py
@@ -1,5 +1,5 @@
 import pyblish.api
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder
@@ -27,7 +27,7 @@ class ValidateLookContents(pyblish.api.InstancePlugin):
     families = ['look']
     hosts = ['maya']
     label = 'Look Data Contents'
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
 
     def process(self, instance):
         """Process all the nodes in the instance"""
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_look_default_shaders_connections.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_default_shaders_connections.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_look_default_shaders_connections.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_look_default_shaders_connections.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_look_id_reference_edits.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_id_reference_edits.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_look_id_reference_edits.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_look_id_reference_edits.py
index 7ae3b4b9b5..5a4ccc16ca 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_look_id_reference_edits.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_id_reference_edits.py
@@ -2,7 +2,7 @@ from collections import defaultdict
 from maya import cmds
 
 import pyblish.api
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     RepairAction,
     ValidateContentsOrder,
@@ -24,7 +24,7 @@ class ValidateLookIdReferenceEdits(pyblish.api.InstancePlugin):
     families = ['look']
     hosts = ['maya']
     label = 'Look Id Reference Edits'
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction,
+    actions = [ayon_maya.api.action.SelectInvalidAction,
                RepairAction]
 
     @classmethod
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_look_no_default_shaders.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_no_default_shaders.py
similarity index 94%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_look_no_default_shaders.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_look_no_default_shaders.py
index 3a67bbd72b..21a056c81c 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_look_no_default_shaders.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_no_default_shaders.py
@@ -1,7 +1,7 @@
 from maya import cmds
 
 import pyblish.api
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
     PublishValidationError
@@ -30,7 +30,7 @@ class ValidateLookNoDefaultShaders(pyblish.api.InstancePlugin):
     families = ['look']
     hosts = ['maya']
     label = 'Look No Default Shaders'
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
 
     DEFAULT_SHADERS = {"lambert1", "initialShadingGroup",
                       "initialParticleSE", "particleCloud1"}
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_look_sets.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_sets.py
similarity index 96%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_look_sets.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_look_sets.py
index dd7515c1fb..97c790c8c6 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_look_sets.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_sets.py
@@ -1,6 +1,6 @@
 import pyblish.api
-import ayon_core.hosts.maya.api.action
-from ayon_core.hosts.maya.api import lib
+import ayon_maya.api.action
+from ayon_maya.api import lib
 from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
     PublishValidationError
@@ -44,7 +44,7 @@ class ValidateLookSets(pyblish.api.InstancePlugin):
     families = ['look']
     hosts = ['maya']
     label = 'Look Sets'
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
 
     def process(self, instance):
         """Process all the nodes in the instance"""
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_look_shading_group.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_shading_group.py
similarity index 95%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_look_shading_group.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_look_shading_group.py
index 070974aef5..25e4eb046d 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_look_shading_group.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_shading_group.py
@@ -1,7 +1,7 @@
 from maya import cmds
 
 import pyblish.api
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     RepairAction,
     ValidateContentsOrder,
@@ -22,7 +22,7 @@ class ValidateShadingEngine(pyblish.api.InstancePlugin,
     hosts = ["maya"]
     label = "Look Shading Engine Naming"
     actions = [
-        ayon_core.hosts.maya.api.action.SelectInvalidAction, RepairAction
+        ayon_maya.api.action.SelectInvalidAction, RepairAction
     ]
     optional = True
 
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_look_single_shader.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_single_shader.py
similarity index 94%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_look_single_shader.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_look_single_shader.py
index c0ffaaf9c0..de0a9619b4 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_look_single_shader.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_single_shader.py
@@ -1,7 +1,7 @@
 import pyblish.api
 from maya import cmds
 
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     PublishValidationError, ValidateContentsOrder)
 
@@ -17,7 +17,7 @@ class ValidateSingleShader(pyblish.api.InstancePlugin):
     families = ['look']
     hosts = ['maya']
     label = 'Look Single Shader Per Shape'
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
 
     # The default connections to check
     def process(self, instance):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_maya_units.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_maya_units.py
similarity index 98%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_maya_units.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_maya_units.py
index 47314b64ac..8171e7e8fa 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_maya_units.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_maya_units.py
@@ -2,7 +2,7 @@ import maya.cmds as cmds
 
 import pyblish.api
 
-import ayon_core.hosts.maya.api.lib as mayalib
+import ayon_maya.api.lib as mayalib
 from ayon_core.pipeline.publish import (
     RepairContextAction,
     ValidateSceneOrder,
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_arnold_attributes.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_arnold_attributes.py
similarity index 96%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_mesh_arnold_attributes.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_arnold_attributes.py
index e9d9a17ff4..5a9841b6c0 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_arnold_attributes.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_arnold_attributes.py
@@ -1,8 +1,8 @@
 from maya import cmds
 import pyblish.api
 
-import ayon_core.hosts.maya.api.action
-from ayon_core.hosts.maya.api.lib import (
+import ayon_maya.api.action
+from ayon_maya.api.lib import (
     maintained_selection,
     delete_after,
     undo_chunk,
@@ -30,7 +30,7 @@ class ValidateMeshArnoldAttributes(pyblish.api.InstancePlugin,
     families = ["model"]
     label = "Mesh Arnold Attributes"
     actions = [
-        ayon_core.hosts.maya.api.action.SelectInvalidAction,
+        ayon_maya.api.action.SelectInvalidAction,
         RepairAction
     ]
 
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_empty.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_empty.py
similarity index 92%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_mesh_empty.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_empty.py
index c95e1ec816..ad2b08ba19 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_empty.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_empty.py
@@ -1,7 +1,7 @@
 from maya import cmds
 
 import pyblish.api
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     RepairAction,
     ValidateMeshOrder,
@@ -21,7 +21,7 @@ class ValidateMeshEmpty(pyblish.api.InstancePlugin):
     families = ["model"]
     label = "Mesh Empty"
     actions = [
-        ayon_core.hosts.maya.api.action.SelectInvalidAction, RepairAction
+        ayon_maya.api.action.SelectInvalidAction, RepairAction
     ]
 
     @classmethod
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_has_uv.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_has_uv.py
similarity index 94%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_mesh_has_uv.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_has_uv.py
index 633fc29732..25da24db1c 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_has_uv.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_has_uv.py
@@ -1,13 +1,13 @@
 from maya import cmds
 
 import pyblish.api
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     ValidateMeshOrder,
     OptionalPyblishPluginMixin,
     PublishValidationError
 )
-from ayon_core.hosts.maya.api.lib import len_flattened
+from ayon_maya.api.lib import len_flattened
 
 
 class ValidateMeshHasUVs(pyblish.api.InstancePlugin,
@@ -24,7 +24,7 @@ class ValidateMeshHasUVs(pyblish.api.InstancePlugin,
     hosts = ['maya']
     families = ['model']
     label = 'Mesh Has UVs'
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
     optional = True
 
     @classmethod
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_lamina_faces.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_lamina_faces.py
similarity index 93%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_mesh_lamina_faces.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_lamina_faces.py
index bfb4257f23..ee6acd1685 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_lamina_faces.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_lamina_faces.py
@@ -1,7 +1,7 @@
 from maya import cmds
 
 import pyblish.api
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     ValidateMeshOrder,
     OptionalPyblishPluginMixin,
@@ -21,7 +21,7 @@ class ValidateMeshLaminaFaces(pyblish.api.InstancePlugin,
     hosts = ['maya']
     families = ['model']
     label = 'Mesh Lamina Faces'
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
     optional = True
 
     description = (
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_ngons.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_ngons.py
similarity index 92%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_mesh_ngons.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_ngons.py
index 58d015e962..f4d907636c 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_ngons.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_ngons.py
@@ -1,8 +1,8 @@
 from maya import cmds
 
 import pyblish.api
-import ayon_core.hosts.maya.api.action
-from ayon_core.hosts.maya.api import lib
+import ayon_maya.api.action
+from ayon_maya.api import lib
 from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
     OptionalPyblishPluginMixin,
@@ -25,7 +25,7 @@ class ValidateMeshNgons(pyblish.api.InstancePlugin,
     hosts = ["maya"]
     families = ["model"]
     label = "Mesh ngons"
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
     optional = True
 
     description = (
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_no_negative_scale.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_no_negative_scale.py
similarity index 94%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_mesh_no_negative_scale.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_no_negative_scale.py
index bf1489f92e..7868015a30 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_no_negative_scale.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_no_negative_scale.py
@@ -1,7 +1,7 @@
 from maya import cmds
 
 import pyblish.api
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     ValidateMeshOrder,
     PublishValidationError,
@@ -33,7 +33,7 @@ class ValidateMeshNoNegativeScale(pyblish.api.InstancePlugin,
     hosts = ['maya']
     families = ['model']
     label = 'Mesh No Negative Scale'
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
     optional = False
 
     @staticmethod
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_non_manifold.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_non_manifold.py
similarity index 98%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_mesh_non_manifold.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_non_manifold.py
index 958707e4f4..dc561be981 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_non_manifold.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_non_manifold.py
@@ -1,7 +1,7 @@
 from maya import cmds, mel
 
 import pyblish.api
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     ValidateMeshOrder,
     PublishXmlValidationError,
@@ -114,7 +114,7 @@ class ValidateMeshNonManifold(pyblish.api.InstancePlugin,
     hosts = ['maya']
     families = ['model']
     label = 'Mesh Non-Manifold Edges/Vertices'
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction,
+    actions = [ayon_maya.api.action.SelectInvalidAction,
                CleanupMatchingPolygons]
     optional = True
 
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_non_zero_edge.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_non_zero_edge.py
similarity index 93%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_mesh_non_zero_edge.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_non_zero_edge.py
index 0a8d6cf159..7830e10f2a 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_non_zero_edge.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_non_zero_edge.py
@@ -1,8 +1,8 @@
 from maya import cmds
 
 import pyblish.api
-import ayon_core.hosts.maya.api.action
-from ayon_core.hosts.maya.api import lib
+import ayon_maya.api.action
+from ayon_maya.api import lib
 from ayon_core.pipeline.publish import (
     ValidateMeshOrder,
     OptionalPyblishPluginMixin,
@@ -25,7 +25,7 @@ class ValidateMeshNonZeroEdgeLength(pyblish.api.InstancePlugin,
     families = ['model']
     hosts = ['maya']
     label = 'Mesh Edge Length Non Zero'
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
     optional = True
 
     __tolerance = 1e-5
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_normals_unlocked.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_normals_unlocked.py
similarity index 95%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_mesh_normals_unlocked.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_normals_unlocked.py
index 76b716d01f..2d8370166b 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_normals_unlocked.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_normals_unlocked.py
@@ -2,7 +2,7 @@ from maya import cmds
 import maya.api.OpenMaya as om2
 
 import pyblish.api
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     RepairAction,
     ValidateMeshOrder,
@@ -31,7 +31,7 @@ class ValidateMeshNormalsUnlocked(pyblish.api.InstancePlugin,
     hosts = ['maya']
     families = ['model']
     label = 'Mesh Normals Unlocked'
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction,
+    actions = [ayon_maya.api.action.SelectInvalidAction,
                RepairAction]
     optional = True
 
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_overlapping_uvs.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_overlapping_uvs.py
similarity index 98%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_mesh_overlapping_uvs.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_overlapping_uvs.py
index a13d16e849..9606ec3202 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_overlapping_uvs.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_overlapping_uvs.py
@@ -5,7 +5,7 @@ from maya import cmds
 import maya.api.OpenMaya as om
 import pyblish.api
 
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     ValidateMeshOrder,
     OptionalPyblishPluginMixin,
@@ -248,7 +248,7 @@ class ValidateMeshHasOverlappingUVs(pyblish.api.InstancePlugin,
     hosts = ['maya']
     families = ['model']
     label = 'Mesh Has Overlapping UVs'
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
     optional = True
 
     @classmethod
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_shader_connections.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_shader_connections.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_mesh_shader_connections.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_shader_connections.py
index 70ede83f2d..2e91df87a3 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_shader_connections.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_shader_connections.py
@@ -1,7 +1,7 @@
 from maya import cmds
 
 import pyblish.api
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     RepairAction,
     ValidateMeshOrder,
@@ -96,7 +96,7 @@ class ValidateMeshShaderConnections(pyblish.api.InstancePlugin,
     hosts = ['maya']
     families = ['model']
     label = "Mesh Shader Connections"
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction,
+    actions = [ayon_maya.api.action.SelectInvalidAction,
                RepairAction]
     optional = True
 
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_single_uv_set.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_single_uv_set.py
similarity index 93%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_mesh_single_uv_set.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_single_uv_set.py
index 21697cd903..d807833a77 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_single_uv_set.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_single_uv_set.py
@@ -1,8 +1,8 @@
 from maya import cmds
 
 import pyblish.api
-import ayon_core.hosts.maya.api.action
-from ayon_core.hosts.maya.api import lib
+import ayon_maya.api.action
+from ayon_maya.api import lib
 from ayon_core.pipeline.publish import (
     RepairAction,
     ValidateMeshOrder,
@@ -26,7 +26,7 @@ class ValidateMeshSingleUVSet(pyblish.api.InstancePlugin,
     families = ['model', 'pointcache']
     optional = True
     label = "Mesh Single UV Set"
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction,
+    actions = [ayon_maya.api.action.SelectInvalidAction,
                RepairAction]
 
     @staticmethod
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_uv_set_map1.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_uv_set_map1.py
similarity index 96%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_mesh_uv_set_map1.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_uv_set_map1.py
index 305a58d78e..c4d3abc624 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_uv_set_map1.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_uv_set_map1.py
@@ -3,7 +3,7 @@ import inspect
 from maya import cmds
 
 import pyblish.api
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     RepairAction,
     ValidateMeshOrder,
@@ -28,7 +28,7 @@ class ValidateMeshUVSetMap1(pyblish.api.InstancePlugin,
     families = ['model']
     optional = True
     label = "Mesh has map1 UV Set"
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction,
+    actions = [ayon_maya.api.action.SelectInvalidAction,
                RepairAction]
 
     @classmethod
@@ -120,10 +120,10 @@ class ValidateMeshUVSetMap1(pyblish.api.InstancePlugin,
     @staticmethod
     def get_description():
         return inspect.cleandoc("""### Mesh found without map1 uv set
-        
+
         A mesh must have a default UV set named `map1` to adhere to the default
         mesh behavior of Maya meshes.
-        
+
         There may be meshes that:
         - Have no UV set
         - Have no `map1` uv set but are using a different name
@@ -131,7 +131,7 @@ class ValidateMeshUVSetMap1(pyblish.api.InstancePlugin,
 
 
         #### Repair
-        
+
         Using repair will try to make the first UV set the `map1` uv set. If it
         does not exist yet it will be created or renames the current first
         UV set to `map1`.
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_vertices_have_edges.py
similarity index 94%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_vertices_have_edges.py
index f0962148dc..9dbdc8fd2b 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_vertices_have_edges.py
@@ -1,8 +1,8 @@
 import pyblish.api
 from maya import cmds
 
-import ayon_core.hosts.maya.api.action
-from ayon_core.hosts.maya.api.lib import len_flattened
+import ayon_maya.api.action
+from ayon_maya.api.lib import len_flattened
 from ayon_core.pipeline.publish import (
     PublishValidationError,
     RepairAction,
@@ -35,7 +35,7 @@ class ValidateMeshVerticesHaveEdges(pyblish.api.InstancePlugin,
     hosts = ['maya']
     families = ['model']
     label = 'Mesh Vertices Have Edges'
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction,
+    actions = [ayon_maya.api.action.SelectInvalidAction,
                RepairAction]
     optional = True
 
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_model_content.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_model_content.py
similarity index 94%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_model_content.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_model_content.py
index bbc644c3db..b06b45db81 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_model_content.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_model_content.py
@@ -3,8 +3,8 @@ import inspect
 from maya import cmds
 
 import pyblish.api
-import ayon_core.hosts.maya.api.action
-from ayon_core.hosts.maya.api import lib
+import ayon_maya.api.action
+from ayon_maya.api import lib
 from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
     PublishValidationError,
@@ -24,7 +24,7 @@ class ValidateModelContent(pyblish.api.InstancePlugin,
     hosts = ["maya"]
     families = ["model"]
     label = "Model Content"
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
 
     validate_top_group = True
     optional = False
@@ -120,18 +120,18 @@ class ValidateModelContent(pyblish.api.InstancePlugin,
                 message="Model content is invalid. See log for more details.",
                 description=self.get_description()
             )
-        
+
     @classmethod
     def get_description(cls):
         return inspect.cleandoc(f"""
             ### Model content is invalid
-            
-            Your model instance does not adhere to the rules of a 
+
+            Your model instance does not adhere to the rules of a
             model product type:
-            
+
             - Must have at least one visible shape in it, like a mesh.
-            - Must have one root node. When exporting multiple meshes they 
+            - Must have one root node. When exporting multiple meshes they
               must be inside a group.
-            - May only contain the following node types: 
+            - May only contain the following node types:
             {", ".join(cls.allowed)}
         """)
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mvlook_contents.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mvlook_contents.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_mvlook_contents.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_mvlook_contents.py
index 8c2bbf2a36..980565afad 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_mvlook_contents.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mvlook_contents.py
@@ -1,6 +1,6 @@
 import os
 import pyblish.api
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
     OptionalPyblishPluginMixin,
@@ -18,7 +18,7 @@ class ValidateMvLookContents(pyblish.api.InstancePlugin,
     families = ['mvLook']
     hosts = ['maya']
     label = 'Validate mvLook Data'
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
 
     # Allow this validation step to be skipped when you just need to
     # get things pushed through.
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_no_animation.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_animation.py
similarity index 93%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_no_animation.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_no_animation.py
index bf45c0e974..0e1f179483 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_no_animation.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_animation.py
@@ -1,7 +1,7 @@
 from maya import cmds
 
 import pyblish.api
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
     OptionalPyblishPluginMixin,
@@ -31,7 +31,7 @@ class ValidateNoAnimation(pyblish.api.InstancePlugin,
     hosts = ["maya"]
     families = ["model"]
     optional = True
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
 
     def process(self, instance):
         if not self.is_active(instance.data):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_no_default_camera.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_default_camera.py
similarity index 93%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_no_default_camera.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_no_default_camera.py
index 3e21ec6e50..be469cd4df 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_no_default_camera.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_default_camera.py
@@ -1,7 +1,7 @@
 from maya import cmds
 
 import pyblish.api
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
     PublishValidationError,
@@ -29,7 +29,7 @@ class ValidateNoDefaultCameras(pyblish.api.InstancePlugin,
     hosts = ['maya']
     families = ['camera']
     label = "No Default Cameras"
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
     optional = False
 
     @staticmethod
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_no_namespace.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_namespace.py
similarity index 95%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_no_namespace.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_no_namespace.py
index f546caff2c..0d7b67e179 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_no_namespace.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_namespace.py
@@ -8,7 +8,7 @@ from ayon_core.pipeline.publish import (
     OptionalPyblishPluginMixin
 )
 
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 
 
 def _as_report_list(values, prefix="- ", suffix="\n"):
@@ -33,7 +33,7 @@ class ValidateNoNamespace(pyblish.api.InstancePlugin,
     hosts = ['maya']
     families = ['model']
     label = 'No Namespaces'
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction,
+    actions = [ayon_maya.api.action.SelectInvalidAction,
                RepairAction]
     optional = False
 
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_no_null_transforms.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_null_transforms.py
similarity index 96%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_no_null_transforms.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_no_null_transforms.py
index 38955fd777..876be073a0 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_no_null_transforms.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_null_transforms.py
@@ -1,7 +1,7 @@
 import maya.cmds as cmds
 
 import pyblish.api
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     RepairAction,
     ValidateContentsOrder,
@@ -50,7 +50,7 @@ class ValidateNoNullTransforms(pyblish.api.InstancePlugin,
     families = ['model']
     label = 'No Empty/Null Transforms'
     actions = [RepairAction,
-               ayon_core.hosts.maya.api.action.SelectInvalidAction]
+               ayon_maya.api.action.SelectInvalidAction]
     optional = False
 
     @staticmethod
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_no_unknown_nodes.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_unknown_nodes.py
similarity index 93%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_no_unknown_nodes.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_no_unknown_nodes.py
index 5cc3e95593..8b4d873014 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_no_unknown_nodes.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_unknown_nodes.py
@@ -1,7 +1,7 @@
 from maya import cmds
 
 import pyblish.api
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
     OptionalPyblishPluginMixin,
@@ -33,7 +33,7 @@ class ValidateNoUnknownNodes(pyblish.api.InstancePlugin,
     families = ['model', 'rig']
     optional = True
     label = "Unknown Nodes"
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
 
     @staticmethod
     def get_invalid(instance):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_no_vraymesh.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_vraymesh.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_no_vraymesh.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_no_vraymesh.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids.py
similarity index 89%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_node_ids.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids.py
index 2d6f231cb5..810dbc4fa1 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids.py
@@ -4,8 +4,8 @@ from ayon_core.pipeline.publish import (
     ValidatePipelineOrder,
     PublishXmlValidationError
 )
-import ayon_core.hosts.maya.api.action
-from ayon_core.hosts.maya.api import lib
+import ayon_maya.api.action
+from ayon_maya.api import lib
 
 
 class ValidateNodeIDs(pyblish.api.InstancePlugin):
@@ -28,8 +28,8 @@ class ValidateNodeIDs(pyblish.api.InstancePlugin):
                 "yetiRig",
                 "assembly"]
 
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction,
-               ayon_core.hosts.maya.api.action.GenerateUUIDsOnInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction,
+               ayon_maya.api.action.GenerateUUIDsOnInvalidAction]
 
     @classmethod
     def apply_settings(cls, project_settings):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_deformed_shapes.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_deformed_shapes.py
similarity index 94%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_deformed_shapes.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_deformed_shapes.py
index 545ab8e28c..4fc8f776ef 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_deformed_shapes.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_deformed_shapes.py
@@ -1,8 +1,8 @@
 import pyblish.api
 from maya import cmds
 
-import ayon_core.hosts.maya.api.action
-from ayon_core.hosts.maya.api import lib
+import ayon_maya.api.action
+from ayon_maya.api import lib
 from ayon_core.pipeline.publish import (
     PublishValidationError, RepairAction, ValidateContentsOrder)
 
@@ -22,7 +22,7 @@ class ValidateNodeIdsDeformedShape(pyblish.api.InstancePlugin):
     hosts = ['maya']
     label = 'Deformed shape ids'
     actions = [
-        ayon_core.hosts.maya.api.action.SelectInvalidAction,
+        ayon_maya.api.action.SelectInvalidAction,
         RepairAction
     ]
 
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_in_database.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_in_database.py
similarity index 93%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_in_database.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_in_database.py
index d679c510af..a1fde89fc3 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_in_database.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_in_database.py
@@ -1,8 +1,8 @@
 import pyblish.api
 import ayon_api
 
-import ayon_core.hosts.maya.api.action
-from ayon_core.hosts.maya.api import lib
+import ayon_maya.api.action
+from ayon_maya.api import lib
 from ayon_core.pipeline.publish import (
     PublishValidationError, ValidatePipelineOrder)
 
@@ -23,8 +23,8 @@ class ValidateNodeIdsInDatabase(pyblish.api.InstancePlugin):
     hosts = ['maya']
     families = ["*"]
 
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction,
-               ayon_core.hosts.maya.api.action.GenerateUUIDsOnInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction,
+               ayon_maya.api.action.GenerateUUIDsOnInvalidAction]
 
     @classmethod
     def apply_settings(cls, project_settings):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_related.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_related.py
similarity index 91%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_related.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_related.py
index 17eb58f421..0ad497d119 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_related.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_related.py
@@ -3,8 +3,8 @@ import uuid
 from collections import defaultdict
 import pyblish.api
 
-import ayon_core.hosts.maya.api.action
-from ayon_core.hosts.maya.api import lib
+import ayon_maya.api.action
+from ayon_maya.api import lib
 from ayon_core.pipeline.publish import (
     OptionalPyblishPluginMixin, PublishValidationError, ValidatePipelineOrder)
 from ayon_api import get_folders
@@ -31,8 +31,8 @@ class ValidateNodeIDsRelated(pyblish.api.InstancePlugin,
                 "rig"]
     optional = True
 
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction,
-               ayon_core.hosts.maya.api.action.GenerateUUIDsOnInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction,
+               ayon_maya.api.action.GenerateUUIDsOnInvalidAction]
 
     @classmethod
     def apply_settings(cls, project_settings):
@@ -109,14 +109,14 @@ class ValidateNodeIDsRelated(pyblish.api.InstancePlugin,
     @staticmethod
     def get_description():
         return inspect.cleandoc("""### Node IDs must match folder id
-        
+
         The node ids must match the folder entity id you are publishing to.
-        
-        Usually these mismatch occurs if you are re-using nodes from another 
-        folder or project. 
-        
+
+        Usually these mismatch occurs if you are re-using nodes from another
+        folder or project.
+
         #### How to repair?
-        
-        The repair action will regenerate new ids for 
+
+        The repair action will regenerate new ids for
         the invalid nodes to match the instance's folder.
         """)
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_unique.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_unique.py
similarity index 91%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_unique.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_unique.py
index 6b44a307d2..ae04a48678 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_unique.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_unique.py
@@ -5,8 +5,8 @@ from ayon_core.pipeline.publish import (
     ValidatePipelineOrder,
     PublishValidationError
 )
-import ayon_core.hosts.maya.api.action
-from ayon_core.hosts.maya.api import lib
+import ayon_maya.api.action
+from ayon_maya.api import lib
 
 from maya import cmds
 
@@ -25,8 +25,8 @@ class ValidateNodeIdsUnique(pyblish.api.InstancePlugin):
                 "rig",
                 "yetiRig"]
 
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction,
-               ayon_core.hosts.maya.api.action.GenerateUUIDsOnInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction,
+               ayon_maya.api.action.GenerateUUIDsOnInvalidAction]
 
     @classmethod
     def apply_settings(cls, project_settings):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_node_no_ghosting.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_no_ghosting.py
similarity index 94%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_node_no_ghosting.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_node_no_ghosting.py
index 10cbbc9a88..1220282d0c 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_node_no_ghosting.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_no_ghosting.py
@@ -2,7 +2,7 @@ from maya import cmds
 
 import pyblish.api
 
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
     OptionalPyblishPluginMixin,
@@ -27,7 +27,7 @@ class ValidateNodeNoGhosting(pyblish.api.InstancePlugin,
     hosts = ['maya']
     families = ['model', 'rig']
     label = "No Ghosting"
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
     optional = False
 
     _attributes = {'ghosting': 0}
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_plugin_path_attributes.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_plugin_path_attributes.py
similarity index 95%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_plugin_path_attributes.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_plugin_path_attributes.py
index f961ec6e4a..ef6f97371f 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_plugin_path_attributes.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_plugin_path_attributes.py
@@ -4,8 +4,8 @@ from maya import cmds
 
 import pyblish.api
 
-from ayon_core.hosts.maya.api.lib import pairwise
-from ayon_core.hosts.maya.api.action import SelectInvalidAction
+from ayon_maya.api.lib import pairwise
+from ayon_maya.api.action import SelectInvalidAction
 from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
     PublishValidationError,
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_render_image_rule.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_render_image_rule.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_render_image_rule.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_render_image_rule.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_render_no_default_cameras.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_render_no_default_cameras.py
similarity index 92%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_render_no_default_cameras.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_render_no_default_cameras.py
index 41c0fa4807..1692b90993 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_render_no_default_cameras.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_render_no_default_cameras.py
@@ -2,7 +2,7 @@ from maya import cmds
 
 import pyblish.api
 
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
     PublishValidationError,
@@ -18,7 +18,7 @@ class ValidateRenderNoDefaultCameras(pyblish.api.InstancePlugin,
     hosts = ['maya']
     families = ['renderlayer']
     label = "No Default Cameras Renderable"
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
     optional = False
 
     @staticmethod
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_render_single_camera.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_render_single_camera.py
similarity index 92%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_render_single_camera.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_render_single_camera.py
index e186d74b89..cb03e68642 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_render_single_camera.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_render_single_camera.py
@@ -4,8 +4,8 @@ import inspect
 import pyblish.api
 from maya import cmds
 
-import ayon_core.hosts.maya.api.action
-from ayon_core.hosts.maya.api.lib_rendersettings import RenderSettings
+import ayon_maya.api.action
+from ayon_maya.api.lib_rendersettings import RenderSettings
 from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
     PublishValidationError,
@@ -26,7 +26,7 @@ class ValidateRenderSingleCamera(pyblish.api.InstancePlugin,
     hosts = ['maya']
     families = ["renderlayer",
                 "vrayscene"]
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
     optional = False
 
     R_CAMERA_TOKEN = re.compile(r'%c|<camera>', re.IGNORECASE)
@@ -77,8 +77,8 @@ class ValidateRenderSingleCamera(pyblish.api.InstancePlugin,
             Your render cameras are misconfigured. You may have no render
             camera set or have multiple cameras with a render filename
             prefix that does not include the `<Camera>` token.
-            
+
             See the logs for more details about the cameras.
-            
+
             """
         )
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_renderlayer_aovs.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_renderlayer_aovs.py
similarity index 94%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_renderlayer_aovs.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_renderlayer_aovs.py
index 910e336fc1..92d97776e1 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_renderlayer_aovs.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_renderlayer_aovs.py
@@ -1,7 +1,7 @@
 import ayon_api
 import pyblish.api
 
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     PublishValidationError,
     OptionalPyblishPluginMixin
@@ -28,7 +28,7 @@ class ValidateRenderLayerAOVs(pyblish.api.InstancePlugin,
     label = "Render Passes / AOVs Are Registered"
     hosts = ["maya"]
     families = ["renderlayer"]
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
     optional = False
 
     def process(self, instance):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_rendersettings.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rendersettings.py
similarity index 99%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_rendersettings.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_rendersettings.py
index 7badfdc027..d5a9ea778c 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_rendersettings.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rendersettings.py
@@ -12,8 +12,8 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     OptionalPyblishPluginMixin
 )
-from ayon_core.hosts.maya.api import lib
-from ayon_core.hosts.maya.api.lib_rendersettings import RenderSettings
+from ayon_maya.api import lib
+from ayon_maya.api.lib_rendersettings import RenderSettings
 
 
 def convert_to_int_or_float(string_value):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_resolution.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_resolution.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_resolution.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_resolution.py
index d822dca288..aae3940e02 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_resolution.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_resolution.py
@@ -5,8 +5,8 @@ from ayon_core.pipeline import (
 )
 from maya import cmds
 from ayon_core.pipeline.publish import RepairAction
-from ayon_core.hosts.maya.api import lib
-from ayon_core.hosts.maya.api.lib import reset_scene_resolution
+from ayon_maya.api import lib
+from ayon_maya.api.lib import reset_scene_resolution
 
 
 class ValidateResolution(pyblish.api.InstancePlugin,
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_resources.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_resources.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_resources.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_resources.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_review.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_review.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_review.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_review.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_contents.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_contents.py
similarity index 98%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_rig_contents.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_contents.py
index f05e2b7311..b8b8728888 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_contents.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_contents.py
@@ -1,6 +1,6 @@
 import pyblish.api
 from maya import cmds
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder,
@@ -22,7 +22,7 @@ class ValidateRigContents(pyblish.api.InstancePlugin,
     label = "Rig Contents"
     hosts = ["maya"]
     families = ["rig"]
-    action = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    action = [ayon_maya.api.action.SelectInvalidAction]
     optional = True
 
     accepted_output = ["mesh", "transform"]
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_controllers.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_controllers.py
similarity index 98%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_rig_controllers.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_controllers.py
index 814ff50177..aed0800160 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_controllers.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_controllers.py
@@ -8,8 +8,8 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     OptionalPyblishPluginMixin
 )
-import ayon_core.hosts.maya.api.action
-from ayon_core.hosts.maya.api.lib import undo_chunk
+import ayon_maya.api.action
+from ayon_maya.api.lib import undo_chunk
 
 
 class ValidateRigControllers(pyblish.api.InstancePlugin,
@@ -37,7 +37,7 @@ class ValidateRigControllers(pyblish.api.InstancePlugin,
     families = ["rig"]
     optional = True
     actions = [RepairAction,
-               ayon_core.hosts.maya.api.action.SelectInvalidAction]
+               ayon_maya.api.action.SelectInvalidAction]
 
     # Default controller values
     CONTROLLER_DEFAULTS = {
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_controllers_arnold_attributes.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_controllers_arnold_attributes.py
similarity index 95%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_rig_controllers_arnold_attributes.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_controllers_arnold_attributes.py
index ea2de81036..4bc47c5949 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_controllers_arnold_attributes.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_controllers_arnold_attributes.py
@@ -9,8 +9,8 @@ from ayon_core.pipeline.publish import (
     OptionalPyblishPluginMixin
 )
 
-from ayon_core.hosts.maya.api import lib
-import ayon_core.hosts.maya.api.action
+from ayon_maya.api import lib
+import ayon_maya.api.action
 
 
 class ValidateRigControllersArnoldAttributes(pyblish.api.InstancePlugin,
@@ -39,7 +39,7 @@ class ValidateRigControllersArnoldAttributes(pyblish.api.InstancePlugin,
     families = ["rig"]
     optional = False
     actions = [RepairAction,
-               ayon_core.hosts.maya.api.action.SelectInvalidAction]
+               ayon_maya.api.action.SelectInvalidAction]
 
     attributes = [
         "rcurve",
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_joints_hidden.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_joints_hidden.py
similarity index 90%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_rig_joints_hidden.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_joints_hidden.py
index 78cc3f5938..d45af574ab 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_joints_hidden.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_joints_hidden.py
@@ -2,8 +2,8 @@ from maya import cmds
 
 import pyblish.api
 
-import ayon_core.hosts.maya.api.action
-from ayon_core.hosts.maya.api import lib
+import ayon_maya.api.action
+from ayon_maya.api import lib
 from ayon_core.pipeline.publish import (
     RepairAction,
     ValidateContentsOrder,
@@ -28,7 +28,7 @@ class ValidateRigJointsHidden(pyblish.api.InstancePlugin,
     hosts = ['maya']
     families = ['rig']
     label = "Joints Hidden"
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction,
+    actions = [ayon_maya.api.action.SelectInvalidAction,
                RepairAction]
     optional = True
 
diff --git a/client/ayon_core/hosts/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
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_rig_out_set_node_ids.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_out_set_node_ids.py
index d94ddc5f2a..e5404aae7e 100644
--- a/client/ayon_core/hosts/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
@@ -2,8 +2,8 @@ import maya.cmds as cmds
 
 import pyblish.api
 
-import ayon_core.hosts.maya.api.action
-from ayon_core.hosts.maya.api import lib
+import ayon_maya.api.action
+from ayon_maya.api import lib
 from ayon_core.pipeline.publish import (
     RepairAction,
     ValidateContentsOrder,
@@ -30,7 +30,7 @@ class ValidateRigOutSetNodeIds(pyblish.api.InstancePlugin,
     hosts = ['maya']
     label = 'Rig Out Set Node Ids'
     actions = [
-        ayon_core.hosts.maya.api.action.SelectInvalidAction,
+        ayon_maya.api.action.SelectInvalidAction,
         RepairAction
     ]
     allow_history_only = False
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_output_ids.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_output_ids.py
similarity index 96%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_rig_output_ids.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_output_ids.py
index d04006f013..c5fee5ddc6 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_output_ids.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_output_ids.py
@@ -4,8 +4,8 @@ from maya import cmds
 
 import pyblish.api
 
-import ayon_core.hosts.maya.api.action
-from ayon_core.hosts.maya.api.lib import get_id, set_id
+import ayon_maya.api.action
+from ayon_maya.api.lib import get_id, set_id
 from ayon_core.pipeline.publish import (
     RepairAction,
     ValidateContentsOrder,
@@ -30,7 +30,7 @@ class ValidateRigOutputIds(pyblish.api.InstancePlugin):
     hosts = ["maya"]
     families = ["rig"]
     actions = [RepairAction,
-               ayon_core.hosts.maya.api.action.SelectInvalidAction]
+               ayon_maya.api.action.SelectInvalidAction]
 
     @classmethod
     def apply_settings(cls, project_settings):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_scene_set_workspace.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_scene_set_workspace.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_scene_set_workspace.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_scene_set_workspace.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_setdress_root.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_setdress_root.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_setdress_root.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_setdress_root.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_shader_name.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_shader_name.py
similarity index 96%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_shader_name.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_shader_name.py
index 09c17202c5..ed1ea17966 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_shader_name.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_shader_name.py
@@ -3,7 +3,7 @@ import re
 import pyblish.api
 from maya import cmds
 
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     OptionalPyblishPluginMixin, PublishValidationError, ValidateContentsOrder)
 
@@ -20,7 +20,7 @@ class ValidateShaderName(pyblish.api.InstancePlugin,
     families = ["look"]
     hosts = ['maya']
     label = 'Validate Shaders Name'
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
     regex = r'(?P<asset>.*)_(.*)_SHD'
 
     # The default connections to check
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_shape_default_names.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_shape_default_names.py
similarity index 96%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_shape_default_names.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_shape_default_names.py
index c4c4c909d3..5355cd9cfd 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_shape_default_names.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_shape_default_names.py
@@ -4,7 +4,7 @@ from maya import cmds
 
 import pyblish.api
 
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
     RepairAction,
@@ -43,7 +43,7 @@ class ValidateShapeDefaultNames(pyblish.api.InstancePlugin,
     families = ['model']
     optional = True
     label = "Shape Default Naming"
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction,
+    actions = [ayon_maya.api.action.SelectInvalidAction,
                RepairAction]
 
     @staticmethod
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_shape_render_stats.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_shape_render_stats.py
similarity index 96%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_shape_render_stats.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_shape_render_stats.py
index 52ce3c5436..e6e2f963e9 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_shape_render_stats.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_shape_render_stats.py
@@ -2,7 +2,7 @@ import pyblish.api
 
 from maya import cmds
 
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     RepairAction,
     ValidateMeshOrder,
@@ -19,7 +19,7 @@ class ValidateShapeRenderStats(pyblish.api.InstancePlugin,
     hosts = ['maya']
     families = ['model']
     label = 'Shape Default Render Stats'
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction,
+    actions = [ayon_maya.api.action.SelectInvalidAction,
                RepairAction]
 
     defaults = {'castsShadows': 1,
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_shape_zero.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_shape_zero.py
similarity index 96%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_shape_zero.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_shape_zero.py
index 6c89258085..6d39e26408 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_shape_zero.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_shape_zero.py
@@ -2,8 +2,8 @@ from maya import cmds
 
 import pyblish.api
 
-import ayon_core.hosts.maya.api.action
-from ayon_core.hosts.maya.api import lib
+import ayon_maya.api.action
+from ayon_maya.api import lib
 from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
     RepairAction,
@@ -25,7 +25,7 @@ class ValidateShapeZero(pyblish.api.InstancePlugin,
     families = ["model"]
     label = "Shape Zero (Freeze)"
     actions = [
-        ayon_core.hosts.maya.api.action.SelectInvalidAction,
+        ayon_maya.api.action.SelectInvalidAction,
         RepairAction
     ]
     optional = True
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_single_assembly.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_single_assembly.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_single_assembly.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_single_assembly.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_skeletalmesh_hierarchy.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_skeletalmesh_hierarchy.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_skeletalmesh_hierarchy.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_skeletalmesh_hierarchy.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_skeletalmesh_triangulated.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_skeletalmesh_triangulated.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_skeletalmesh_triangulated.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_skeletalmesh_triangulated.py
index cc25e769e6..7e63ed2ae3 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_skeletalmesh_triangulated.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_skeletalmesh_triangulated.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import pyblish.api
 
-from ayon_core.hosts.maya.api.action import (
+from ayon_maya.api.action import (
     SelectInvalidAction,
 )
 from ayon_core.pipeline.publish import (
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_skeleton_top_group_hierarchy.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_skeleton_top_group_hierarchy.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_skeleton_top_group_hierarchy.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_skeleton_top_group_hierarchy.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_skinCluster_deformer_set.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_skinCluster_deformer_set.py
similarity index 96%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_skinCluster_deformer_set.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_skinCluster_deformer_set.py
index a548e12f33..7a7b6a9048 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_skinCluster_deformer_set.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_skinCluster_deformer_set.py
@@ -2,7 +2,7 @@ from maya import cmds
 
 import pyblish.api
 
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
     OptionalPyblishPluginMixin,
@@ -24,7 +24,7 @@ class ValidateSkinclusterDeformerSet(pyblish.api.InstancePlugin,
     hosts = ['maya']
     families = ['fbx']
     label = "Skincluster Deformer Relationships"
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
     optional = False
 
     def process(self, instance):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_step_size.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_step_size.py
similarity index 92%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_step_size.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_step_size.py
index a276a5b644..1373048cc2 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_step_size.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_step_size.py
@@ -1,6 +1,6 @@
 import pyblish.api
 
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder,
@@ -21,7 +21,7 @@ class ValidateStepSize(pyblish.api.InstancePlugin,
     families = ['camera',
                 'pointcache',
                 'animation']
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
     optional = False
     MIN = 0.01
     MAX = 1.0
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_transform_naming_suffix.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_transform_naming_suffix.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_transform_naming_suffix.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_transform_naming_suffix.py
index e565866778..846fc86650 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_transform_naming_suffix.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_transform_naming_suffix.py
@@ -5,7 +5,7 @@ from maya import cmds
 
 import pyblish.api
 
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
     OptionalPyblishPluginMixin,
@@ -40,7 +40,7 @@ class ValidateTransformNamingSuffix(pyblish.api.InstancePlugin,
     families = ["model"]
     optional = True
     label = "Suffix Naming Conventions"
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
     SUFFIX_NAMING_TABLE = json.dumps({
         "mesh": ["_GEO", "_GES", "_GEP", "_OSD"],
         "nurbsCurve": ["_CRV"],
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_transform_zero.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_transform_zero.py
similarity index 94%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_transform_zero.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_transform_zero.py
index cd96ebb10d..51fa7938ef 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_transform_zero.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_transform_zero.py
@@ -3,7 +3,7 @@ import inspect
 from maya import cmds
 import pyblish.api
 
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
     PublishValidationError,
@@ -25,7 +25,7 @@ class ValidateTransformZero(pyblish.api.InstancePlugin,
     hosts = ["maya"]
     families = ["model"]
     label = "Transform Zero (Freeze)"
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
 
     _identity = [1.0, 0.0, 0.0, 0.0,
                  0.0, 1.0, 0.0, 0.0,
@@ -86,7 +86,7 @@ class ValidateTransformZero(pyblish.api.InstancePlugin,
     def get_description():
         return inspect.cleandoc("""### Transform can't have any values
 
-        The model publish allows no transformations. 
+        The model publish allows no transformations.
 
         You must **freeze transformations** to continue.
 
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_unique_names.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_unique_names.py
similarity index 91%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_unique_names.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_unique_names.py
index 0066d70531..74f2292680 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_unique_names.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_unique_names.py
@@ -1,7 +1,7 @@
 from maya import cmds
 
 import pyblish.api
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
     OptionalPyblishPluginMixin,
@@ -21,7 +21,7 @@ class ValidateUniqueNames(pyblish.api.InstancePlugin,
     hosts = ["maya"]
     families = ["model"]
     label = "Unique transform name"
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
     optional = True
 
     @staticmethod
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_unreal_mesh_triangulated.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_unreal_mesh_triangulated.py
similarity index 91%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_unreal_mesh_triangulated.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_unreal_mesh_triangulated.py
index 6440c00eae..f6207797a7 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_unreal_mesh_triangulated.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_unreal_mesh_triangulated.py
@@ -8,7 +8,7 @@ from ayon_core.pipeline.publish import (
     OptionalPyblishPluginMixin,
     PublishValidationError
 )
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 
 
 class ValidateUnrealMeshTriangulated(pyblish.api.InstancePlugin,
@@ -19,7 +19,7 @@ class ValidateUnrealMeshTriangulated(pyblish.api.InstancePlugin,
     hosts = ["maya"]
     families = ["staticMesh"]
     label = "Mesh is Triangulated"
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
     active = False
 
     @classmethod
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_unreal_staticmesh_naming.py
similarity index 98%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_unreal_staticmesh_naming.py
index 88b0ff0e71..eff980843e 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_unreal_staticmesh_naming.py
@@ -4,7 +4,7 @@ import re
 
 import pyblish.api
 
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
     OptionalPyblishPluginMixin,
@@ -58,7 +58,7 @@ class ValidateUnrealStaticMeshName(pyblish.api.InstancePlugin,
     hosts = ["maya"]
     families = ["staticMesh"]
     label = "Unreal Static Mesh Name"
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
     regex_mesh = r"(?P<renderName>.*))"
     regex_collision = r"(?P<renderName>.*)"
 
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_unreal_up_axis.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_unreal_up_axis.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_unreal_up_axis.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_unreal_up_axis.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_visible_only.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_visible_only.py
similarity index 91%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_visible_only.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_visible_only.py
index 1fdb476dba..4252585324 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_visible_only.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_visible_only.py
@@ -1,7 +1,7 @@
 import pyblish.api
 
-from ayon_core.hosts.maya.api.lib import iter_visible_nodes_in_range
-import ayon_core.hosts.maya.api.action
+from ayon_maya.api.lib import iter_visible_nodes_in_range
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
     PublishValidationError,
@@ -21,7 +21,7 @@ class ValidateAlembicVisibleOnly(pyblish.api.InstancePlugin,
     label = "Alembic Visible Only"
     hosts = ["maya"]
     families = ["pointcache", "animation"]
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
     optional = False
 
     def process(self, instance):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_vray.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_vray.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_vray.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_vray.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_vray_distributed_rendering.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_vray_distributed_rendering.py
similarity index 98%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_vray_distributed_rendering.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_vray_distributed_rendering.py
index b3978b8483..76c87f3e8b 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_vray_distributed_rendering.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_vray_distributed_rendering.py
@@ -1,7 +1,7 @@
 import pyblish.api
 from maya import cmds
 
-from ayon_core.hosts.maya.api import lib
+from ayon_maya.api import lib
 from ayon_core.pipeline.publish import (
     KnownPublishError,
     PublishValidationError,
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_vray_referenced_aovs.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_vray_referenced_aovs.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_vray_referenced_aovs.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_vray_referenced_aovs.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_vray_translator_settings.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_vray_translator_settings.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_vray_translator_settings.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_vray_translator_settings.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_vrayproxy.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_vrayproxy.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_vrayproxy.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_vrayproxy.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_vrayproxy_members.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_vrayproxy_members.py
similarity index 91%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_vrayproxy_members.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_vrayproxy_members.py
index 6732d09202..40315a1e40 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_vrayproxy_members.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_vrayproxy_members.py
@@ -2,7 +2,7 @@ import pyblish.api
 
 from maya import cmds
 
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     PublishValidationError,
     OptionalPyblishPluginMixin
@@ -18,7 +18,7 @@ class ValidateVrayProxyMembers(pyblish.api.InstancePlugin,
     label = 'VRay Proxy Members'
     hosts = ['maya']
     families = ['vrayproxy']
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
     optional = False
 
     def process(self, instance):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_xgen.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_xgen.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_xgen.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_xgen.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_yeti_renderscript_callbacks.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_renderscript_callbacks.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_yeti_renderscript_callbacks.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_renderscript_callbacks.py
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_yeti_rig_cache_state.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_rig_cache_state.py
similarity index 94%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_yeti_rig_cache_state.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_rig_cache_state.py
index 84614fc0be..87887b7d36 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_yeti_rig_cache_state.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_rig_cache_state.py
@@ -2,7 +2,7 @@ import inspect
 
 import pyblish.api
 import maya.cmds as cmds
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     RepairAction,
     PublishValidationError,
@@ -25,7 +25,7 @@ class ValidateYetiRigCacheState(pyblish.api.InstancePlugin,
     hosts = ["maya"]
     families = ["yetiRig"]
     actions = [RepairAction,
-               ayon_core.hosts.maya.api.action.SelectInvalidAction]
+               ayon_maya.api.action.SelectInvalidAction]
     optional = False
 
     def process(self, instance):
diff --git a/client/ayon_core/hosts/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
similarity index 93%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_yeti_rig_input_in_instance.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_rig_input_in_instance.py
index 77e189e37b..59a6867c17 100644
--- a/client/ayon_core/hosts/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
@@ -2,7 +2,7 @@ from maya import cmds
 
 import pyblish.api
 
-import ayon_core.hosts.maya.api.action
+import ayon_maya.api.action
 from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
     PublishValidationError,
@@ -18,7 +18,7 @@ class ValidateYetiRigInputShapesInInstance(pyblish.api.InstancePlugin,
     hosts = ["maya"]
     families = ["yetiRig"]
     label = "Yeti Rig Input Shapes In Instance"
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
+    actions = [ayon_maya.api.action.SelectInvalidAction]
     optional = False
 
     def process(self, instance):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_yeti_rig_settings.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_rig_settings.py
similarity index 100%
rename from client/ayon_core/hosts/maya/plugins/publish/validate_yeti_rig_settings.py
rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_rig_settings.py
diff --git a/client/ayon_core/hosts/maya/plugins/workfile_build/load_placeholder.py b/server_addon/maya/client/ayon_maya/plugins/workfile_build/load_placeholder.py
similarity index 97%
rename from client/ayon_core/hosts/maya/plugins/workfile_build/load_placeholder.py
rename to server_addon/maya/client/ayon_maya/plugins/workfile_build/load_placeholder.py
index b07c7e9a70..6cf38e591a 100644
--- a/client/ayon_core/hosts/maya/plugins/workfile_build/load_placeholder.py
+++ b/server_addon/maya/client/ayon_maya/plugins/workfile_build/load_placeholder.py
@@ -4,12 +4,12 @@ from ayon_core.pipeline.workfile.workfile_template_builder import (
     PlaceholderLoadMixin,
     LoadPlaceholderItem
 )
-from ayon_core.hosts.maya.api.lib import (
+from ayon_maya.api.lib import (
     get_container_transforms,
     get_node_parent,
     get_node_index_under_parent
 )
-from ayon_core.hosts.maya.api.workfile_template_builder import (
+from ayon_maya.api.workfile_template_builder import (
     MayaPlaceholderPlugin,
 )
 
diff --git a/client/ayon_core/hosts/maya/plugins/workfile_build/script_placeholder.py b/server_addon/maya/client/ayon_maya/plugins/workfile_build/script_placeholder.py
similarity index 99%
rename from client/ayon_core/hosts/maya/plugins/workfile_build/script_placeholder.py
rename to server_addon/maya/client/ayon_maya/plugins/workfile_build/script_placeholder.py
index 62e10ba023..ff54306220 100644
--- a/client/ayon_core/hosts/maya/plugins/workfile_build/script_placeholder.py
+++ b/server_addon/maya/client/ayon_maya/plugins/workfile_build/script_placeholder.py
@@ -1,6 +1,6 @@
 from maya import cmds
 
-from ayon_core.hosts.maya.api.workfile_template_builder import (
+from ayon_maya.api.workfile_template_builder import (
     MayaPlaceholderPlugin
 )
 from ayon_core.lib import NumberDef, TextDef, EnumDef
diff --git a/client/ayon_core/hosts/maya/startup/userSetup.py b/server_addon/maya/client/ayon_maya/startup/userSetup.py
similarity index 96%
rename from client/ayon_core/hosts/maya/startup/userSetup.py
rename to server_addon/maya/client/ayon_maya/startup/userSetup.py
index 3112e2bf12..600864fd2b 100644
--- a/client/ayon_core/hosts/maya/startup/userSetup.py
+++ b/server_addon/maya/client/ayon_maya/startup/userSetup.py
@@ -2,7 +2,7 @@ import os
 
 from ayon_core.settings import get_project_settings
 from ayon_core.pipeline import install_host, get_current_project_name
-from ayon_core.hosts.maya.api import MayaHost
+from ayon_maya.api import MayaHost
 
 from maya import cmds
 
diff --git a/client/ayon_core/hosts/maya/tools/__init__.py b/server_addon/maya/client/ayon_maya/tools/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/maya/tools/__init__.py
rename to server_addon/maya/client/ayon_maya/tools/__init__.py
diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/LICENSE b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/LICENSE
similarity index 100%
rename from client/ayon_core/hosts/maya/tools/mayalookassigner/LICENSE
rename to server_addon/maya/client/ayon_maya/tools/mayalookassigner/LICENSE
diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/__init__.py b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/maya/tools/mayalookassigner/__init__.py
rename to server_addon/maya/client/ayon_maya/tools/mayalookassigner/__init__.py
diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/alembic.py b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/alembic.py
similarity index 100%
rename from client/ayon_core/hosts/maya/tools/mayalookassigner/alembic.py
rename to server_addon/maya/client/ayon_maya/tools/mayalookassigner/alembic.py
diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/app.py b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/app.py
similarity index 99%
rename from client/ayon_core/hosts/maya/tools/mayalookassigner/app.py
rename to server_addon/maya/client/ayon_maya/tools/mayalookassigner/app.py
index 44d8dfda21..2937b72934 100644
--- a/client/ayon_core/hosts/maya/tools/mayalookassigner/app.py
+++ b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/app.py
@@ -8,7 +8,7 @@ from qtpy import QtWidgets, QtCore
 from ayon_core import style
 from ayon_core.pipeline import get_current_project_name
 from ayon_core.tools.utils.lib import qt_app_context
-from ayon_core.hosts.maya.api.lib import (
+from ayon_maya.api.lib import (
     assign_look_by_version,
     get_main_window
 )
diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/arnold_standin.py b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/arnold_standin.py
similarity index 99%
rename from client/ayon_core/hosts/maya/tools/mayalookassigner/arnold_standin.py
rename to server_addon/maya/client/ayon_maya/tools/mayalookassigner/arnold_standin.py
index a20880dffc..c285b857c7 100644
--- a/client/ayon_core/hosts/maya/tools/mayalookassigner/arnold_standin.py
+++ b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/arnold_standin.py
@@ -7,7 +7,7 @@ from maya import cmds
 import ayon_api
 
 from ayon_core.pipeline import get_current_project_name
-from ayon_core.hosts.maya import api
+from ayon_maya import api
 
 from . import lib
 from .alembic import get_alembic_ids_cache
diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/commands.py b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/commands.py
similarity index 99%
rename from client/ayon_core/hosts/maya/tools/mayalookassigner/commands.py
rename to server_addon/maya/client/ayon_maya/tools/mayalookassigner/commands.py
index ad43a24385..54b1cff740 100644
--- a/client/ayon_core/hosts/maya/tools/mayalookassigner/commands.py
+++ b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/commands.py
@@ -10,7 +10,7 @@ from ayon_core.pipeline import (
     registered_host,
     get_current_project_name,
 )
-from ayon_core.hosts.maya.api import lib
+from ayon_maya.api import lib
 
 from .vray_proxies import get_alembic_ids_cache
 from . import arnold_standin
diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/lib.py b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/lib.py
similarity index 98%
rename from client/ayon_core/hosts/maya/tools/mayalookassigner/lib.py
rename to server_addon/maya/client/ayon_maya/tools/mayalookassigner/lib.py
index 78fded12a9..5417db26bc 100644
--- a/client/ayon_core/hosts/maya/tools/mayalookassigner/lib.py
+++ b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/lib.py
@@ -11,7 +11,7 @@ from ayon_core.pipeline import (
     loaders_from_representation,
     load_container
 )
-from ayon_core.hosts.maya.api import lib
+from ayon_maya.api import lib
 
 
 log = logging.getLogger(__name__)
diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/models.py b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/models.py
similarity index 100%
rename from client/ayon_core/hosts/maya/tools/mayalookassigner/models.py
rename to server_addon/maya/client/ayon_maya/tools/mayalookassigner/models.py
diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/usd.py b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/usd.py
similarity index 100%
rename from client/ayon_core/hosts/maya/tools/mayalookassigner/usd.py
rename to server_addon/maya/client/ayon_maya/tools/mayalookassigner/usd.py
diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/views.py b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/views.py
similarity index 100%
rename from client/ayon_core/hosts/maya/tools/mayalookassigner/views.py
rename to server_addon/maya/client/ayon_maya/tools/mayalookassigner/views.py
diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/vray_proxies.py b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/vray_proxies.py
similarity index 98%
rename from client/ayon_core/hosts/maya/tools/mayalookassigner/vray_proxies.py
rename to server_addon/maya/client/ayon_maya/tools/mayalookassigner/vray_proxies.py
index c1d9f019e4..6b451abb9a 100644
--- a/client/ayon_core/hosts/maya/tools/mayalookassigner/vray_proxies.py
+++ b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/vray_proxies.py
@@ -7,7 +7,7 @@ from maya import cmds
 import ayon_api
 
 from ayon_core.pipeline import get_current_project_name
-import ayon_core.hosts.maya.api.lib as maya_lib
+import ayon_maya.api.lib as maya_lib
 from . import lib
 from .alembic import get_alembic_ids_cache
 
diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/widgets.py b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/widgets.py
similarity index 100%
rename from client/ayon_core/hosts/maya/tools/mayalookassigner/widgets.py
rename to server_addon/maya/client/ayon_maya/tools/mayalookassigner/widgets.py
diff --git a/client/ayon_core/hosts/maya/vendor/python/capture.py b/server_addon/maya/client/ayon_maya/vendor/python/capture.py
similarity index 100%
rename from client/ayon_core/hosts/maya/vendor/python/capture.py
rename to server_addon/maya/client/ayon_maya/vendor/python/capture.py
diff --git a/server_addon/maya/package.py b/server_addon/maya/package.py
index 4537c23eaa..274f74869b 100644
--- a/server_addon/maya/package.py
+++ b/server_addon/maya/package.py
@@ -1,3 +1,7 @@
 name = "maya"
 title = "Maya"
-version = "0.1.20"
+version = "0.2.0"
+
+ayon_required_addons = {
+    "core": ">0.3.2",
+}