diff --git a/client/ayon_core/hosts/traypublisher/__init__.py b/server_addon/traypublisher/client/ayon_traypublisher/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/__init__.py
rename to server_addon/traypublisher/client/ayon_traypublisher/__init__.py
diff --git a/client/ayon_core/hosts/traypublisher/addon.py b/server_addon/traypublisher/client/ayon_traypublisher/addon.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/addon.py
rename to server_addon/traypublisher/client/ayon_traypublisher/addon.py
diff --git a/client/ayon_core/hosts/traypublisher/api/__init__.py b/server_addon/traypublisher/client/ayon_traypublisher/api/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/api/__init__.py
rename to server_addon/traypublisher/client/ayon_traypublisher/api/__init__.py
diff --git a/client/ayon_core/hosts/traypublisher/api/editorial.py b/server_addon/traypublisher/client/ayon_traypublisher/api/editorial.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/api/editorial.py
rename to server_addon/traypublisher/client/ayon_traypublisher/api/editorial.py
diff --git a/client/ayon_core/hosts/traypublisher/api/pipeline.py b/server_addon/traypublisher/client/ayon_traypublisher/api/pipeline.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/api/pipeline.py
rename to server_addon/traypublisher/client/ayon_traypublisher/api/pipeline.py
diff --git a/client/ayon_core/hosts/traypublisher/api/plugin.py b/server_addon/traypublisher/client/ayon_traypublisher/api/plugin.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/api/plugin.py
rename to server_addon/traypublisher/client/ayon_traypublisher/api/plugin.py
diff --git a/client/ayon_core/hosts/traypublisher/batch_parsing.py b/server_addon/traypublisher/client/ayon_traypublisher/batch_parsing.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/batch_parsing.py
rename to server_addon/traypublisher/client/ayon_traypublisher/batch_parsing.py
diff --git a/client/ayon_core/hosts/traypublisher/csv_publish.py b/server_addon/traypublisher/client/ayon_traypublisher/csv_publish.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/csv_publish.py
rename to server_addon/traypublisher/client/ayon_traypublisher/csv_publish.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/create/create_colorspace_look.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_colorspace_look.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/create/create_colorspace_look.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_colorspace_look.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/create/create_csv_ingest.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_csv_ingest.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/create/create_csv_ingest.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_csv_ingest.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/create/create_editorial.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_editorial.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/create/create_editorial.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_editorial.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/create/create_editorial_package.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_editorial_package.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/create/create_editorial_package.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_editorial_package.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/create/create_from_settings.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_from_settings.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/create/create_from_settings.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_from_settings.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/create/create_movie_batch.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_movie_batch.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/create/create_movie_batch.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_movie_batch.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/create/create_online.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_online.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/create/create_online.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_online.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_app_name.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_app_name.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/collect_app_name.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_app_name.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_clip_instances.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_clip_instances.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/collect_clip_instances.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_clip_instances.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_colorspace_look.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_colorspace_look.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/collect_colorspace_look.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_colorspace_look.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_csv_ingest_instance_data.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_csv_ingest_instance_data.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/collect_csv_ingest_instance_data.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_csv_ingest_instance_data.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_editorial_instances.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_editorial_instances.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/collect_editorial_instances.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_editorial_instances.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_editorial_package.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_editorial_package.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/collect_editorial_package.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_editorial_package.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_editorial_reviewable.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_editorial_reviewable.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/collect_editorial_reviewable.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_editorial_reviewable.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_explicit_colorspace.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_explicit_colorspace.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/collect_explicit_colorspace.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_explicit_colorspace.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_frame_data_from_folder_entity.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_frame_data_from_folder_entity.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/collect_frame_data_from_folder_entity.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_frame_data_from_folder_entity.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_movie_batch.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_movie_batch.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/collect_movie_batch.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_movie_batch.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_online_file.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_online_file.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/collect_online_file.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_online_file.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_review_frames.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_review_frames.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/collect_review_frames.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_review_frames.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_sequence_frame_data.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_sequence_frame_data.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/collect_sequence_frame_data.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_sequence_frame_data.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_shot_instances.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_shot_instances.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/collect_shot_instances.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_shot_instances.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_simple_instances.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_simple_instances.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/collect_simple_instances.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_simple_instances.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_source.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_source.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/collect_source.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_source.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/extract_colorspace_look.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/extract_colorspace_look.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/extract_colorspace_look.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/extract_colorspace_look.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/extract_csv_file.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/extract_csv_file.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/extract_csv_file.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/extract_csv_file.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/extract_editorial_pckg.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/extract_editorial_pckg.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/help/validate_existing_version.xml b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/help/validate_existing_version.xml
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/help/validate_existing_version.xml
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/help/validate_existing_version.xml
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/help/validate_frame_ranges.xml b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/help/validate_frame_ranges.xml
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/help/validate_frame_ranges.xml
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/help/validate_frame_ranges.xml
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_colorspace.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/validate_colorspace.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/validate_colorspace.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/validate_colorspace.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_colorspace_look.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/validate_colorspace_look.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/validate_colorspace_look.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/validate_colorspace_look.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_editorial_package.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/validate_editorial_package.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/validate_editorial_package.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/validate_editorial_package.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_existing_version.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/validate_existing_version.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/validate_existing_version.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/validate_existing_version.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_filepaths.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/validate_filepaths.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/validate_filepaths.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/validate_filepaths.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_frame_ranges.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/validate_frame_ranges.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/validate_frame_ranges.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/validate_frame_ranges.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_online_file.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/validate_online_file.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/validate_online_file.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/validate_online_file.py