diff --git a/client/ayon_core/hosts/resolve/README.markdown b/server_addon/resolve/client/ayon_resolve/README.markdown
similarity index 100%
rename from client/ayon_core/hosts/resolve/README.markdown
rename to server_addon/resolve/client/ayon_resolve/README.markdown
diff --git a/client/ayon_core/hosts/resolve/RESOLVE_API_v19.0B-build20.txt b/server_addon/resolve/client/ayon_resolve/RESOLVE_API_v19.0B-build20.txt
similarity index 100%
rename from client/ayon_core/hosts/resolve/RESOLVE_API_v19.0B-build20.txt
rename to server_addon/resolve/client/ayon_resolve/RESOLVE_API_v19.0B-build20.txt
diff --git a/client/ayon_core/hosts/resolve/__init__.py b/server_addon/resolve/client/ayon_resolve/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/resolve/__init__.py
rename to server_addon/resolve/client/ayon_resolve/__init__.py
diff --git a/client/ayon_core/hosts/resolve/addon.py b/server_addon/resolve/client/ayon_resolve/addon.py
similarity index 100%
rename from client/ayon_core/hosts/resolve/addon.py
rename to server_addon/resolve/client/ayon_resolve/addon.py
diff --git a/client/ayon_core/hosts/resolve/api/__init__.py b/server_addon/resolve/client/ayon_resolve/api/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/resolve/api/__init__.py
rename to server_addon/resolve/client/ayon_resolve/api/__init__.py
diff --git a/client/ayon_core/hosts/resolve/api/action.py b/server_addon/resolve/client/ayon_resolve/api/action.py
similarity index 100%
rename from client/ayon_core/hosts/resolve/api/action.py
rename to server_addon/resolve/client/ayon_resolve/api/action.py
diff --git a/client/ayon_core/hosts/resolve/api/lib.py b/server_addon/resolve/client/ayon_resolve/api/lib.py
similarity index 100%
rename from client/ayon_core/hosts/resolve/api/lib.py
rename to server_addon/resolve/client/ayon_resolve/api/lib.py
diff --git a/client/ayon_core/hosts/resolve/api/menu.py b/server_addon/resolve/client/ayon_resolve/api/menu.py
similarity index 100%
rename from client/ayon_core/hosts/resolve/api/menu.py
rename to server_addon/resolve/client/ayon_resolve/api/menu.py
diff --git a/client/ayon_core/hosts/resolve/api/menu_style.qss b/server_addon/resolve/client/ayon_resolve/api/menu_style.qss
similarity index 100%
rename from client/ayon_core/hosts/resolve/api/menu_style.qss
rename to server_addon/resolve/client/ayon_resolve/api/menu_style.qss
diff --git a/client/ayon_core/hosts/resolve/api/pipeline.py b/server_addon/resolve/client/ayon_resolve/api/pipeline.py
similarity index 100%
rename from client/ayon_core/hosts/resolve/api/pipeline.py
rename to server_addon/resolve/client/ayon_resolve/api/pipeline.py
diff --git a/client/ayon_core/hosts/resolve/api/plugin.py b/server_addon/resolve/client/ayon_resolve/api/plugin.py
similarity index 100%
rename from client/ayon_core/hosts/resolve/api/plugin.py
rename to server_addon/resolve/client/ayon_resolve/api/plugin.py
diff --git a/client/ayon_core/hosts/resolve/api/testing_utils.py b/server_addon/resolve/client/ayon_resolve/api/testing_utils.py
similarity index 100%
rename from client/ayon_core/hosts/resolve/api/testing_utils.py
rename to server_addon/resolve/client/ayon_resolve/api/testing_utils.py
diff --git a/client/ayon_core/hosts/resolve/api/todo-rendering.py b/server_addon/resolve/client/ayon_resolve/api/todo-rendering.py
similarity index 100%
rename from client/ayon_core/hosts/resolve/api/todo-rendering.py
rename to server_addon/resolve/client/ayon_resolve/api/todo-rendering.py
diff --git a/client/ayon_core/hosts/resolve/api/utils.py b/server_addon/resolve/client/ayon_resolve/api/utils.py
similarity index 100%
rename from client/ayon_core/hosts/resolve/api/utils.py
rename to server_addon/resolve/client/ayon_resolve/api/utils.py
diff --git a/client/ayon_core/hosts/resolve/api/workio.py b/server_addon/resolve/client/ayon_resolve/api/workio.py
similarity index 100%
rename from client/ayon_core/hosts/resolve/api/workio.py
rename to server_addon/resolve/client/ayon_resolve/api/workio.py
diff --git a/client/ayon_core/hosts/resolve/hooks/pre_resolve_last_workfile.py b/server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_last_workfile.py
similarity index 100%
rename from client/ayon_core/hosts/resolve/hooks/pre_resolve_last_workfile.py
rename to server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_last_workfile.py
diff --git a/client/ayon_core/hosts/resolve/hooks/pre_resolve_setup.py b/server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_setup.py
similarity index 100%
rename from client/ayon_core/hosts/resolve/hooks/pre_resolve_setup.py
rename to server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_setup.py
diff --git a/client/ayon_core/hosts/resolve/hooks/pre_resolve_startup.py b/server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_startup.py
similarity index 100%
rename from client/ayon_core/hosts/resolve/hooks/pre_resolve_startup.py
rename to server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_startup.py
diff --git a/client/ayon_core/hosts/resolve/otio/__init__.py b/server_addon/resolve/client/ayon_resolve/otio/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/resolve/otio/__init__.py
rename to server_addon/resolve/client/ayon_resolve/otio/__init__.py
diff --git a/client/ayon_core/hosts/resolve/otio/davinci_export.py b/server_addon/resolve/client/ayon_resolve/otio/davinci_export.py
similarity index 100%
rename from client/ayon_core/hosts/resolve/otio/davinci_export.py
rename to server_addon/resolve/client/ayon_resolve/otio/davinci_export.py
diff --git a/client/ayon_core/hosts/resolve/otio/davinci_import.py b/server_addon/resolve/client/ayon_resolve/otio/davinci_import.py
similarity index 100%
rename from client/ayon_core/hosts/resolve/otio/davinci_import.py
rename to server_addon/resolve/client/ayon_resolve/otio/davinci_import.py
diff --git a/client/ayon_core/hosts/resolve/otio/utils.py b/server_addon/resolve/client/ayon_resolve/otio/utils.py
similarity index 100%
rename from client/ayon_core/hosts/resolve/otio/utils.py
rename to server_addon/resolve/client/ayon_resolve/otio/utils.py
diff --git a/client/ayon_core/hosts/resolve/plugins/create/create_shot_clip.py b/server_addon/resolve/client/ayon_resolve/plugins/create/create_shot_clip.py
similarity index 100%
rename from client/ayon_core/hosts/resolve/plugins/create/create_shot_clip.py
rename to server_addon/resolve/client/ayon_resolve/plugins/create/create_shot_clip.py
diff --git a/client/ayon_core/hosts/resolve/plugins/load/load_clip.py b/server_addon/resolve/client/ayon_resolve/plugins/load/load_clip.py
similarity index 100%
rename from client/ayon_core/hosts/resolve/plugins/load/load_clip.py
rename to server_addon/resolve/client/ayon_resolve/plugins/load/load_clip.py
diff --git a/client/ayon_core/hosts/resolve/plugins/load/load_editorial_package.py b/server_addon/resolve/client/ayon_resolve/plugins/load/load_editorial_package.py
similarity index 100%
rename from client/ayon_core/hosts/resolve/plugins/load/load_editorial_package.py
rename to server_addon/resolve/client/ayon_resolve/plugins/load/load_editorial_package.py
diff --git a/client/ayon_core/hosts/resolve/plugins/publish/extract_workfile.py b/server_addon/resolve/client/ayon_resolve/plugins/publish/extract_workfile.py
similarity index 100%
rename from client/ayon_core/hosts/resolve/plugins/publish/extract_workfile.py
rename to server_addon/resolve/client/ayon_resolve/plugins/publish/extract_workfile.py
diff --git a/client/ayon_core/hosts/resolve/plugins/publish/precollect_instances.py b/server_addon/resolve/client/ayon_resolve/plugins/publish/precollect_instances.py
similarity index 100%
rename from client/ayon_core/hosts/resolve/plugins/publish/precollect_instances.py
rename to server_addon/resolve/client/ayon_resolve/plugins/publish/precollect_instances.py
diff --git a/client/ayon_core/hosts/resolve/plugins/publish/precollect_workfile.py b/server_addon/resolve/client/ayon_resolve/plugins/publish/precollect_workfile.py
similarity index 100%
rename from client/ayon_core/hosts/resolve/plugins/publish/precollect_workfile.py
rename to server_addon/resolve/client/ayon_resolve/plugins/publish/precollect_workfile.py
diff --git a/client/ayon_core/hosts/resolve/startup.py b/server_addon/resolve/client/ayon_resolve/startup.py
similarity index 100%
rename from client/ayon_core/hosts/resolve/startup.py
rename to server_addon/resolve/client/ayon_resolve/startup.py
diff --git a/client/ayon_core/hosts/resolve/utility_scripts/AYON__Menu.py b/server_addon/resolve/client/ayon_resolve/utility_scripts/AYON__Menu.py
similarity index 100%
rename from client/ayon_core/hosts/resolve/utility_scripts/AYON__Menu.py
rename to server_addon/resolve/client/ayon_resolve/utility_scripts/AYON__Menu.py
diff --git a/client/ayon_core/hosts/resolve/utility_scripts/ayon_startup.scriptlib b/server_addon/resolve/client/ayon_resolve/utility_scripts/ayon_startup.scriptlib
similarity index 100%
rename from client/ayon_core/hosts/resolve/utility_scripts/ayon_startup.scriptlib
rename to server_addon/resolve/client/ayon_resolve/utility_scripts/ayon_startup.scriptlib
diff --git a/client/ayon_core/hosts/resolve/utility_scripts/develop/OTIO_export.py b/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OTIO_export.py
similarity index 100%
rename from client/ayon_core/hosts/resolve/utility_scripts/develop/OTIO_export.py
rename to server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OTIO_export.py
diff --git a/client/ayon_core/hosts/resolve/utility_scripts/develop/OTIO_import.py b/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OTIO_import.py
similarity index 100%
rename from client/ayon_core/hosts/resolve/utility_scripts/develop/OTIO_import.py
rename to server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OTIO_import.py
diff --git a/client/ayon_core/hosts/resolve/utility_scripts/develop/OpenPype_sync_util_scripts.py b/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OpenPype_sync_util_scripts.py
similarity index 100%
rename from client/ayon_core/hosts/resolve/utility_scripts/develop/OpenPype_sync_util_scripts.py
rename to server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OpenPype_sync_util_scripts.py
diff --git a/client/ayon_core/hosts/resolve/utils.py b/server_addon/resolve/client/ayon_resolve/utils.py
similarity index 100%
rename from client/ayon_core/hosts/resolve/utils.py
rename to server_addon/resolve/client/ayon_resolve/utils.py