diff --git a/server_addon/tvpaint/client/ayon_tvpaint/api/communication_server.py b/server_addon/tvpaint/client/ayon_tvpaint/api/communication_server.py
index d185bdf685..7ccb49f07e 100644
--- a/server_addon/tvpaint/client/ayon_tvpaint/api/communication_server.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/api/communication_server.py
@@ -22,7 +22,7 @@ from aiohttp_json_rpc.protocol import (
 from aiohttp_json_rpc.exceptions import RpcError
 
 from ayon_core.lib import emit_event
-from ayon_core.hosts.tvpaint.tvpaint_plugin import get_plugin_files_path
+from ayon_tvpaint.tvpaint_plugin import get_plugin_files_path
 
 log = logging.getLogger(__name__)
 log.setLevel(logging.DEBUG)
diff --git a/server_addon/tvpaint/client/ayon_tvpaint/api/launch_script.py b/server_addon/tvpaint/client/ayon_tvpaint/api/launch_script.py
index bcc92d8b6d..1e23e95572 100644
--- a/server_addon/tvpaint/client/ayon_tvpaint/api/launch_script.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/api/launch_script.py
@@ -10,7 +10,7 @@ from qtpy import QtWidgets, QtCore, QtGui
 
 from ayon_core import style
 from ayon_core.pipeline import install_host
-from ayon_core.hosts.tvpaint.api import (
+from ayon_tvpaint.api import (
     TVPaintHost,
     CommunicationWrapper,
 )
diff --git a/server_addon/tvpaint/client/ayon_tvpaint/api/pipeline.py b/server_addon/tvpaint/client/ayon_tvpaint/api/pipeline.py
index 6f5c4d49d4..5ec6355138 100644
--- a/server_addon/tvpaint/client/ayon_tvpaint/api/pipeline.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/api/pipeline.py
@@ -7,8 +7,9 @@ import requests
 import ayon_api
 import pyblish.api
 
+from ayon_tvpaint import TVPAINT_ROOT_DIR
+
 from ayon_core.host import HostBase, IWorkfileHost, ILoadHost, IPublishHost
-from ayon_core.hosts.tvpaint import TVPAINT_ROOT_DIR
 from ayon_core.settings import get_current_project_settings
 from ayon_core.lib import register_event_callback
 from ayon_core.pipeline import (
diff --git a/server_addon/tvpaint/client/ayon_tvpaint/hooks/pre_launch_args.py b/server_addon/tvpaint/client/ayon_tvpaint/hooks/pre_launch_args.py
index 691b81e089..8ee91aa0e7 100644
--- a/server_addon/tvpaint/client/ayon_tvpaint/hooks/pre_launch_args.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/hooks/pre_launch_args.py
@@ -37,6 +37,6 @@ class TvpaintPrelaunchHook(PreLaunchHook):
             self.launch_context.launch_args.extend(remainders)
 
     def launch_script_path(self):
-        from ayon_core.hosts.tvpaint import get_launch_script_path
+        from ayon_tvpaint import get_launch_script_path
 
         return get_launch_script_path()
diff --git a/server_addon/tvpaint/client/ayon_tvpaint/plugins/create/convert_legacy.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/create/convert_legacy.py
index 34fe0ce8f4..e79a6565e8 100644
--- a/server_addon/tvpaint/client/ayon_tvpaint/plugins/create/convert_legacy.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/create/convert_legacy.py
@@ -4,8 +4,8 @@ from ayon_core.pipeline.create.creator_plugins import (
     ProductConvertorPlugin,
     cache_and_get_instances,
 )
-from ayon_core.hosts.tvpaint.api.plugin import SHARED_DATA_KEY
-from ayon_core.hosts.tvpaint.api.lib import get_groups_data
+from ayon_tvpaint.api.plugin import SHARED_DATA_KEY
+from ayon_tvpaint.api.lib import get_groups_data
 
 
 class TVPaintLegacyConverted(ProductConvertorPlugin):
diff --git a/server_addon/tvpaint/client/ayon_tvpaint/plugins/create/create_render.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/create/create_render.py
index dc9c2466e0..2286a4417a 100644
--- a/server_addon/tvpaint/client/ayon_tvpaint/plugins/create/create_render.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/create/create_render.py
@@ -52,11 +52,11 @@ from ayon_core.pipeline.create import (
     CreatedInstance,
     CreatorError,
 )
-from ayon_core.hosts.tvpaint.api.plugin import (
+from ayon_tvpaint.api.plugin import (
     TVPaintCreator,
     TVPaintAutoCreator,
 )
-from ayon_core.hosts.tvpaint.api.lib import (
+from ayon_tvpaint.api.lib import (
     get_layers_data,
     get_groups_data,
     execute_george_through_file,
diff --git a/server_addon/tvpaint/client/ayon_tvpaint/plugins/create/create_review.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/create/create_review.py
index acb4f0f8d6..6068ffa1d8 100644
--- a/server_addon/tvpaint/client/ayon_tvpaint/plugins/create/create_review.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/create/create_review.py
@@ -1,7 +1,7 @@
 import ayon_api
 
 from ayon_core.pipeline import CreatedInstance
-from ayon_core.hosts.tvpaint.api.plugin import TVPaintAutoCreator
+from ayon_tvpaint.api.plugin import TVPaintAutoCreator
 
 
 class TVPaintReviewCreator(TVPaintAutoCreator):
diff --git a/server_addon/tvpaint/client/ayon_tvpaint/plugins/create/create_workfile.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/create/create_workfile.py
index f21f41439e..b08f731869 100644
--- a/server_addon/tvpaint/client/ayon_tvpaint/plugins/create/create_workfile.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/create/create_workfile.py
@@ -1,7 +1,7 @@
 import ayon_api
 
 from ayon_core.pipeline import CreatedInstance
-from ayon_core.hosts.tvpaint.api.plugin import TVPaintAutoCreator
+from ayon_tvpaint.api.plugin import TVPaintAutoCreator
 
 
 class TVPaintWorkfileCreator(TVPaintAutoCreator):
diff --git a/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_image.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_image.py
index aad8f92d26..de61992d3f 100644
--- a/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_image.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_image.py
@@ -1,6 +1,6 @@
 from ayon_core.lib.attribute_definitions import BoolDef
-from ayon_core.hosts.tvpaint.api import plugin
-from ayon_core.hosts.tvpaint.api.lib import execute_george_through_file
+from ayon_tvpaint.api import plugin
+from ayon_tvpaint.api.lib import execute_george_through_file
 
 
 class ImportImage(plugin.Loader):
diff --git a/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_reference_image.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_reference_image.py
index a7fcb9f4a4..ce08aa9cd9 100644
--- a/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_reference_image.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_reference_image.py
@@ -2,12 +2,12 @@ import collections
 
 from ayon_core.lib.attribute_definitions import BoolDef
 from ayon_core.pipeline import registered_host
-from ayon_core.hosts.tvpaint.api import plugin
-from ayon_core.hosts.tvpaint.api.lib import (
+from ayon_tvpaint.api import plugin
+from ayon_tvpaint.api.lib import (
     get_layers_data,
     execute_george_through_file,
 )
-from ayon_core.hosts.tvpaint.api.pipeline import (
+from ayon_tvpaint.api.pipeline import (
     write_workfile_metadata,
     SECTION_NAME_CONTAINERS,
     containerise,
diff --git a/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_sound.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_sound.py
index 7e8c8022d6..086afba079 100644
--- a/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_sound.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_sound.py
@@ -1,7 +1,7 @@
 import os
 import tempfile
-from ayon_core.hosts.tvpaint.api import plugin
-from ayon_core.hosts.tvpaint.api.lib import (
+from ayon_tvpaint.api import plugin
+from ayon_tvpaint.api.lib import (
     execute_george_through_file,
 )
 
diff --git a/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_workfile.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_workfile.py
index 07c2d91533..045e22f188 100644
--- a/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_workfile.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_workfile.py
@@ -10,11 +10,11 @@ from ayon_core.pipeline.workfile import (
     get_last_workfile_with_version,
 )
 from ayon_core.pipeline.template_data import get_template_data_with_names
-from ayon_core.hosts.tvpaint.api import plugin
-from ayon_core.hosts.tvpaint.api.lib import (
+from ayon_tvpaint.api import plugin
+from ayon_tvpaint.api.lib import (
     execute_george_through_file,
 )
-from ayon_core.hosts.tvpaint.api.pipeline import (
+from ayon_tvpaint.api.pipeline import (
     get_current_workfile_context,
 )
 from ayon_core.pipeline.version_start import get_versioning_start
diff --git a/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/collect_workfile_data.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/collect_workfile_data.py
index 3155773bda..8f32b57e67 100644
--- a/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/collect_workfile_data.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/collect_workfile_data.py
@@ -4,13 +4,13 @@ import tempfile
 
 import pyblish.api
 
-from ayon_core.hosts.tvpaint.api.lib import (
+from ayon_tvpaint.api.lib import (
     execute_george,
     execute_george_through_file,
     get_layers_data,
     get_groups_data,
 )
-from ayon_core.hosts.tvpaint.api.pipeline import (
+from ayon_tvpaint.api.pipeline import (
     SECTION_NAME_CONTEXT,
     SECTION_NAME_INSTANCES,
     SECTION_NAME_CONTAINERS,
diff --git a/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/extract_sequence.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/extract_sequence.py
index fe5e148b7b..dc06726295 100644
--- a/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/extract_sequence.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/extract_sequence.py
@@ -10,13 +10,13 @@ from ayon_core.pipeline.publish import (
     KnownPublishError,
     get_publish_instance_families,
 )
-from ayon_core.hosts.tvpaint.api.lib import (
+from ayon_tvpaint.api.lib import (
     execute_george,
     execute_george_through_file,
     get_layers_pre_post_behavior,
     get_layers_exposure_frames,
 )
-from ayon_core.hosts.tvpaint.lib import (
+from ayon_tvpaint.lib import (
     calculate_layers_extraction_data,
     get_frame_filename_template,
     fill_reference_frames,
diff --git a/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_asset_name.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_asset_name.py
index 764c090720..55b06aa489 100644
--- a/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_asset_name.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_asset_name.py
@@ -3,7 +3,7 @@ from ayon_core.pipeline import (
     PublishXmlValidationError,
     OptionalPyblishPluginMixin,
 )
-from ayon_core.hosts.tvpaint.api.pipeline import (
+from ayon_tvpaint.api.pipeline import (
     list_instances,
     write_instances,
 )
diff --git a/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_marks.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_marks.py
index 6bfbe840bb..f4e7eae2e1 100644
--- a/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_marks.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_marks.py
@@ -5,7 +5,7 @@ from ayon_core.pipeline import (
     PublishXmlValidationError,
     OptionalPyblishPluginMixin,
 )
-from ayon_core.hosts.tvpaint.api.lib import execute_george
+from ayon_tvpaint.api.lib import execute_george
 
 
 class ValidateMarksRepair(pyblish.api.Action):
diff --git a/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_start_frame.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_start_frame.py
index fea64bd6a8..f8f4fbb3c9 100644
--- a/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_start_frame.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_start_frame.py
@@ -3,7 +3,7 @@ from ayon_core.pipeline import (
     PublishXmlValidationError,
     OptionalPyblishPluginMixin,
 )
-from ayon_core.hosts.tvpaint.api.lib import execute_george
+from ayon_tvpaint.api.lib import execute_george
 
 
 class RepairStartFrame(pyblish.api.Action):
diff --git a/server_addon/tvpaint/client/ayon_tvpaint/worker/worker.py b/server_addon/tvpaint/client/ayon_tvpaint/worker/worker.py
index 3d9b1ef2b8..aa79fd442c 100644
--- a/server_addon/tvpaint/client/ayon_tvpaint/worker/worker.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/worker/worker.py
@@ -5,11 +5,11 @@ import tempfile
 import shutil
 import asyncio
 
-from ayon_core.hosts.tvpaint.api.communication_server import (
+from ayon_tvpaint.api.communication_server import (
     BaseCommunicator,
     CommunicationWrapper
 )
-from openpype_modules.job_queue.job_workers import WorkerJobsConnection
+from ayon_core.modules.job_queue.job_workers import WorkerJobsConnection
 
 from .worker_job import ProcessTVPaintCommands
 
diff --git a/server_addon/tvpaint/client/ayon_tvpaint/worker/worker_job.py b/server_addon/tvpaint/client/ayon_tvpaint/worker/worker_job.py
index f111ed369a..db91010c47 100644
--- a/server_addon/tvpaint/client/ayon_tvpaint/worker/worker_job.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/worker/worker_job.py
@@ -256,7 +256,7 @@ class CollectSceneData(BaseCommand):
     name = "collect_scene_data"
 
     def execute(self):
-        from ayon_core.hosts.tvpaint.api.lib import (
+        from ayon_tvpaint.api.lib import (
             get_layers_data,
             get_groups_data,
             get_layers_pre_post_behavior,