diff --git a/client/ayon_core/hosts/tvpaint/__init__.py b/server_addon/tvpaint/client/ayon_tvpaint/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/__init__.py
rename to server_addon/tvpaint/client/ayon_tvpaint/__init__.py
diff --git a/client/ayon_core/hosts/tvpaint/addon.py b/server_addon/tvpaint/client/ayon_tvpaint/addon.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/addon.py
rename to server_addon/tvpaint/client/ayon_tvpaint/addon.py
diff --git a/client/ayon_core/hosts/tvpaint/api/__init__.py b/server_addon/tvpaint/client/ayon_tvpaint/api/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/api/__init__.py
rename to server_addon/tvpaint/client/ayon_tvpaint/api/__init__.py
diff --git a/client/ayon_core/hosts/tvpaint/api/communication_server.py b/server_addon/tvpaint/client/ayon_tvpaint/api/communication_server.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/api/communication_server.py
rename to server_addon/tvpaint/client/ayon_tvpaint/api/communication_server.py
diff --git a/client/ayon_core/hosts/tvpaint/api/launch_script.py b/server_addon/tvpaint/client/ayon_tvpaint/api/launch_script.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/api/launch_script.py
rename to server_addon/tvpaint/client/ayon_tvpaint/api/launch_script.py
diff --git a/client/ayon_core/hosts/tvpaint/api/lib.py b/server_addon/tvpaint/client/ayon_tvpaint/api/lib.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/api/lib.py
rename to server_addon/tvpaint/client/ayon_tvpaint/api/lib.py
diff --git a/client/ayon_core/hosts/tvpaint/api/pipeline.py b/server_addon/tvpaint/client/ayon_tvpaint/api/pipeline.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/api/pipeline.py
rename to server_addon/tvpaint/client/ayon_tvpaint/api/pipeline.py
diff --git a/client/ayon_core/hosts/tvpaint/api/plugin.py b/server_addon/tvpaint/client/ayon_tvpaint/api/plugin.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/api/plugin.py
rename to server_addon/tvpaint/client/ayon_tvpaint/api/plugin.py
diff --git a/client/ayon_core/hosts/tvpaint/hooks/pre_launch_args.py b/server_addon/tvpaint/client/ayon_tvpaint/hooks/pre_launch_args.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/hooks/pre_launch_args.py
rename to server_addon/tvpaint/client/ayon_tvpaint/hooks/pre_launch_args.py
diff --git a/client/ayon_core/hosts/tvpaint/lib.py b/server_addon/tvpaint/client/ayon_tvpaint/lib.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/lib.py
rename to server_addon/tvpaint/client/ayon_tvpaint/lib.py
diff --git a/client/ayon_core/hosts/tvpaint/plugins/create/convert_legacy.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/create/convert_legacy.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/create/convert_legacy.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/create/convert_legacy.py
diff --git a/client/ayon_core/hosts/tvpaint/plugins/create/create_render.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/create/create_render.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/create/create_render.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/create/create_render.py
diff --git a/client/ayon_core/hosts/tvpaint/plugins/create/create_review.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/create/create_review.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/create/create_review.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/create/create_review.py
diff --git a/client/ayon_core/hosts/tvpaint/plugins/create/create_workfile.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/create/create_workfile.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/create/create_workfile.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/create/create_workfile.py
diff --git a/client/ayon_core/hosts/tvpaint/plugins/load/load_image.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_image.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/load/load_image.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_image.py
diff --git a/client/ayon_core/hosts/tvpaint/plugins/load/load_reference_image.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_reference_image.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/load/load_reference_image.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_reference_image.py
diff --git a/client/ayon_core/hosts/tvpaint/plugins/load/load_sound.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_sound.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/load/load_sound.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_sound.py
diff --git a/client/ayon_core/hosts/tvpaint/plugins/load/load_workfile.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_workfile.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/load/load_workfile.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_workfile.py
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/collect_instance_frames.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/collect_instance_frames.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/collect_instance_frames.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/collect_instance_frames.py
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/collect_render_instances.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/collect_render_instances.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/collect_render_instances.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/collect_render_instances.py
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/collect_workfile.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/collect_workfile.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/collect_workfile.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/collect_workfile.py
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/collect_workfile_data.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/collect_workfile_data.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/collect_workfile_data.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/collect_workfile_data.py
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/extract_convert_to_exr.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/extract_convert_to_exr.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/extract_convert_to_exr.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/extract_convert_to_exr.py
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/extract_sequence.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/extract_sequence.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/extract_sequence.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/extract_sequence.py
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_asset_name.xml b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_asset_name.xml
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_asset_name.xml
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_asset_name.xml
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_duplicated_layer_names.xml b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_duplicated_layer_names.xml
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_duplicated_layer_names.xml
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_duplicated_layer_names.xml
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_layers_visibility.xml b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_layers_visibility.xml
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_layers_visibility.xml
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_layers_visibility.xml
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_marks.xml b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_marks.xml
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_marks.xml
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_marks.xml
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_missing_layer_names.xml b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_missing_layer_names.xml
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_missing_layer_names.xml
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_missing_layer_names.xml
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_render_layer_group.xml b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_render_layer_group.xml
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_render_layer_group.xml
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_render_layer_group.xml
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_render_pass_group.xml b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_render_pass_group.xml
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_render_pass_group.xml
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_render_pass_group.xml
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_scene_settings.xml b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_scene_settings.xml
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_scene_settings.xml
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_scene_settings.xml
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_start_frame.xml b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_start_frame.xml
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_start_frame.xml
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_start_frame.xml
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_workfile_metadata.xml b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_workfile_metadata.xml
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_workfile_metadata.xml
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_workfile_metadata.xml
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_workfile_project_name.xml b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_workfile_project_name.xml
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_workfile_project_name.xml
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_workfile_project_name.xml
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/increment_workfile_version.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/increment_workfile_version.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/increment_workfile_version.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/increment_workfile_version.py
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_asset_name.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_asset_name.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/validate_asset_name.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_asset_name.py
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_duplicated_layer_names.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_duplicated_layer_names.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/validate_duplicated_layer_names.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_duplicated_layer_names.py
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_layers_visibility.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_layers_visibility.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/validate_layers_visibility.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_layers_visibility.py
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_marks.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_marks.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/validate_marks.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_marks.py
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_missing_layer_names.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_missing_layer_names.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/validate_missing_layer_names.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_missing_layer_names.py
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_render_layer_group.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_render_layer_group.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/validate_render_layer_group.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_render_layer_group.py
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_render_pass_group.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_render_pass_group.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/validate_render_pass_group.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_render_pass_group.py
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_scene_settings.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_scene_settings.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/validate_scene_settings.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_scene_settings.py
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_start_frame.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_start_frame.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/validate_start_frame.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_start_frame.py
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_workfile_metadata.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_workfile_metadata.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/validate_workfile_metadata.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_workfile_metadata.py
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_workfile_project_name.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_workfile_project_name.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/validate_workfile_project_name.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_workfile_project_name.py
diff --git a/client/ayon_core/hosts/tvpaint/resources/template.tvpp b/server_addon/tvpaint/client/ayon_tvpaint/resources/template.tvpp
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/resources/template.tvpp
rename to server_addon/tvpaint/client/ayon_tvpaint/resources/template.tvpp
diff --git a/client/ayon_core/hosts/tvpaint/tvpaint_plugin/__init__.py b/server_addon/tvpaint/client/ayon_tvpaint/tvpaint_plugin/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/tvpaint_plugin/__init__.py
rename to server_addon/tvpaint/client/ayon_tvpaint/tvpaint_plugin/__init__.py
diff --git a/client/ayon_core/hosts/tvpaint/tvpaint_plugin/plugin_code/CMakeLists.txt b/server_addon/tvpaint/client/ayon_tvpaint/tvpaint_plugin/plugin_code/CMakeLists.txt
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/tvpaint_plugin/plugin_code/CMakeLists.txt
rename to server_addon/tvpaint/client/ayon_tvpaint/tvpaint_plugin/plugin_code/CMakeLists.txt
diff --git a/client/ayon_core/hosts/tvpaint/tvpaint_plugin/plugin_code/README.md b/server_addon/tvpaint/client/ayon_tvpaint/tvpaint_plugin/plugin_code/README.md
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/tvpaint_plugin/plugin_code/README.md
rename to server_addon/tvpaint/client/ayon_tvpaint/tvpaint_plugin/plugin_code/README.md
diff --git a/client/ayon_core/hosts/tvpaint/tvpaint_plugin/plugin_code/library.cpp b/server_addon/tvpaint/client/ayon_tvpaint/tvpaint_plugin/plugin_code/library.cpp
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/tvpaint_plugin/plugin_code/library.cpp
rename to server_addon/tvpaint/client/ayon_tvpaint/tvpaint_plugin/plugin_code/library.cpp
diff --git a/client/ayon_core/hosts/tvpaint/tvpaint_plugin/plugin_code/library.def b/server_addon/tvpaint/client/ayon_tvpaint/tvpaint_plugin/plugin_code/library.def
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/tvpaint_plugin/plugin_code/library.def
rename to server_addon/tvpaint/client/ayon_tvpaint/tvpaint_plugin/plugin_code/library.def
diff --git a/client/ayon_core/hosts/tvpaint/tvpaint_plugin/plugin_files/windows_x64/plugin/OpenPypePlugin.dll b/server_addon/tvpaint/client/ayon_tvpaint/tvpaint_plugin/plugin_files/windows_x64/plugin/OpenPypePlugin.dll
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/tvpaint_plugin/plugin_files/windows_x64/plugin/OpenPypePlugin.dll
rename to server_addon/tvpaint/client/ayon_tvpaint/tvpaint_plugin/plugin_files/windows_x64/plugin/OpenPypePlugin.dll
diff --git a/client/ayon_core/hosts/tvpaint/tvpaint_plugin/plugin_files/windows_x86/plugin/OpenPypePlugin.dll b/server_addon/tvpaint/client/ayon_tvpaint/tvpaint_plugin/plugin_files/windows_x86/plugin/OpenPypePlugin.dll
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/tvpaint_plugin/plugin_files/windows_x86/plugin/OpenPypePlugin.dll
rename to server_addon/tvpaint/client/ayon_tvpaint/tvpaint_plugin/plugin_files/windows_x86/plugin/OpenPypePlugin.dll
diff --git a/client/ayon_core/hosts/tvpaint/worker/__init__.py b/server_addon/tvpaint/client/ayon_tvpaint/worker/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/worker/__init__.py
rename to server_addon/tvpaint/client/ayon_tvpaint/worker/__init__.py
diff --git a/client/ayon_core/hosts/tvpaint/worker/init_file.tvpp b/server_addon/tvpaint/client/ayon_tvpaint/worker/init_file.tvpp
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/worker/init_file.tvpp
rename to server_addon/tvpaint/client/ayon_tvpaint/worker/init_file.tvpp
diff --git a/client/ayon_core/hosts/tvpaint/worker/worker.py b/server_addon/tvpaint/client/ayon_tvpaint/worker/worker.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/worker/worker.py
rename to server_addon/tvpaint/client/ayon_tvpaint/worker/worker.py
diff --git a/client/ayon_core/hosts/tvpaint/worker/worker_job.py b/server_addon/tvpaint/client/ayon_tvpaint/worker/worker_job.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/worker/worker_job.py
rename to server_addon/tvpaint/client/ayon_tvpaint/worker/worker_job.py