diff --git a/server_addon/traypublisher/client/ayon_traypublisher/addon.py b/server_addon/traypublisher/client/ayon_traypublisher/addon.py
index 3e72681e1d..5432cb1a92 100644
--- a/server_addon/traypublisher/client/ayon_traypublisher/addon.py
+++ b/server_addon/traypublisher/client/ayon_traypublisher/addon.py
@@ -55,9 +55,9 @@ def cli_main():
 def launch():
     """Launch TrayPublish tool UI."""
 
-    from ayon_core.tools import traypublisher
+    from ayon_traypublisher import ui
 
-    traypublisher.main()
+    ui.main()
 
 
 @cli_main.command()
diff --git a/client/ayon_core/tools/traypublisher/__init__.py b/server_addon/traypublisher/client/ayon_traypublisher/ui/__init__.py
similarity index 100%
rename from client/ayon_core/tools/traypublisher/__init__.py
rename to server_addon/traypublisher/client/ayon_traypublisher/ui/__init__.py
diff --git a/client/ayon_core/tools/traypublisher/window.py b/server_addon/traypublisher/client/ayon_traypublisher/ui/window.py
similarity index 100%
rename from client/ayon_core/tools/traypublisher/window.py
rename to server_addon/traypublisher/client/ayon_traypublisher/ui/window.py