diff --git a/client/ayon_core/modules/deadline/__init__.py b/server_addon/deadline/client/ayon_deadline/__init__.py
similarity index 100%
rename from client/ayon_core/modules/deadline/__init__.py
rename to server_addon/deadline/client/ayon_deadline/__init__.py
diff --git a/client/ayon_core/modules/deadline/abstract_submit_deadline.py b/server_addon/deadline/client/ayon_deadline/abstract_submit_deadline.py
similarity index 100%
rename from client/ayon_core/modules/deadline/abstract_submit_deadline.py
rename to server_addon/deadline/client/ayon_deadline/abstract_submit_deadline.py
diff --git a/client/ayon_core/modules/deadline/deadline_module.py b/server_addon/deadline/client/ayon_deadline/deadline_module.py
similarity index 100%
rename from client/ayon_core/modules/deadline/deadline_module.py
rename to server_addon/deadline/client/ayon_deadline/deadline_module.py
diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_deadline_server_from_instance.py
similarity index 100%
rename from client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
rename to server_addon/deadline/client/ayon_deadline/plugins/publish/collect_deadline_server_from_instance.py
diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_default_deadline_server.py
similarity index 100%
rename from client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py
rename to server_addon/deadline/client/ayon_deadline/plugins/publish/collect_default_deadline_server.py
diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_pools.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_pools.py
similarity index 100%
rename from client/ayon_core/modules/deadline/plugins/publish/collect_pools.py
rename to server_addon/deadline/client/ayon_deadline/plugins/publish/collect_pools.py
diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_user_credentials.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_user_credentials.py
similarity index 100%
rename from client/ayon_core/modules/deadline/plugins/publish/collect_user_credentials.py
rename to server_addon/deadline/client/ayon_deadline/plugins/publish/collect_user_credentials.py
diff --git a/client/ayon_core/modules/deadline/plugins/publish/help/validate_deadline_connection.xml b/server_addon/deadline/client/ayon_deadline/plugins/publish/help/validate_deadline_connection.xml
similarity index 100%
rename from client/ayon_core/modules/deadline/plugins/publish/help/validate_deadline_connection.xml
rename to server_addon/deadline/client/ayon_deadline/plugins/publish/help/validate_deadline_connection.xml
diff --git a/client/ayon_core/modules/deadline/plugins/publish/help/validate_deadline_pools.xml b/server_addon/deadline/client/ayon_deadline/plugins/publish/help/validate_deadline_pools.xml
similarity index 100%
rename from client/ayon_core/modules/deadline/plugins/publish/help/validate_deadline_pools.xml
rename to server_addon/deadline/client/ayon_deadline/plugins/publish/help/validate_deadline_pools.xml
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_aftereffects_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_aftereffects_deadline.py
similarity index 100%
rename from client/ayon_core/modules/deadline/plugins/publish/submit_aftereffects_deadline.py
rename to server_addon/deadline/client/ayon_deadline/plugins/publish/submit_aftereffects_deadline.py
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_blender_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_blender_deadline.py
similarity index 100%
rename from client/ayon_core/modules/deadline/plugins/publish/submit_blender_deadline.py
rename to server_addon/deadline/client/ayon_deadline/plugins/publish/submit_blender_deadline.py
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_celaction_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_celaction_deadline.py
similarity index 100%
rename from client/ayon_core/modules/deadline/plugins/publish/submit_celaction_deadline.py
rename to server_addon/deadline/client/ayon_deadline/plugins/publish/submit_celaction_deadline.py
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_fusion_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_fusion_deadline.py
similarity index 100%
rename from client/ayon_core/modules/deadline/plugins/publish/submit_fusion_deadline.py
rename to server_addon/deadline/client/ayon_deadline/plugins/publish/submit_fusion_deadline.py
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_harmony_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_harmony_deadline.py
similarity index 100%
rename from client/ayon_core/modules/deadline/plugins/publish/submit_harmony_deadline.py
rename to server_addon/deadline/client/ayon_deadline/plugins/publish/submit_harmony_deadline.py
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_cache_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_houdini_cache_deadline.py
similarity index 100%
rename from client/ayon_core/modules/deadline/plugins/publish/submit_houdini_cache_deadline.py
rename to server_addon/deadline/client/ayon_deadline/plugins/publish/submit_houdini_cache_deadline.py
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_render_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_houdini_render_deadline.py
similarity index 100%
rename from client/ayon_core/modules/deadline/plugins/publish/submit_houdini_render_deadline.py
rename to server_addon/deadline/client/ayon_deadline/plugins/publish/submit_houdini_render_deadline.py
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_max_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_max_deadline.py
similarity index 100%
rename from client/ayon_core/modules/deadline/plugins/publish/submit_max_deadline.py
rename to server_addon/deadline/client/ayon_deadline/plugins/publish/submit_max_deadline.py
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_maya_deadline.py
similarity index 100%
rename from client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py
rename to server_addon/deadline/client/ayon_deadline/plugins/publish/submit_maya_deadline.py
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_nuke_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_nuke_deadline.py
similarity index 100%
rename from client/ayon_core/modules/deadline/plugins/publish/submit_nuke_deadline.py
rename to server_addon/deadline/client/ayon_deadline/plugins/publish/submit_nuke_deadline.py
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_publish_cache_job.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_cache_job.py
similarity index 100%
rename from client/ayon_core/modules/deadline/plugins/publish/submit_publish_cache_job.py
rename to server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_cache_job.py
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_publish_job.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_job.py
similarity index 100%
rename from client/ayon_core/modules/deadline/plugins/publish/submit_publish_job.py
rename to server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_job.py
diff --git a/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_connection.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/validate_deadline_connection.py
similarity index 100%
rename from client/ayon_core/modules/deadline/plugins/publish/validate_deadline_connection.py
rename to server_addon/deadline/client/ayon_deadline/plugins/publish/validate_deadline_connection.py
diff --git a/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_pools.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/validate_deadline_pools.py
similarity index 100%
rename from client/ayon_core/modules/deadline/plugins/publish/validate_deadline_pools.py
rename to server_addon/deadline/client/ayon_deadline/plugins/publish/validate_deadline_pools.py
diff --git a/client/ayon_core/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/validate_expected_and_rendered_files.py
similarity index 100%
rename from client/ayon_core/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py
rename to server_addon/deadline/client/ayon_deadline/plugins/publish/validate_expected_and_rendered_files.py
diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/Ayon/Ayon.ico b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/Ayon/Ayon.ico
similarity index 100%
rename from client/ayon_core/modules/deadline/repository/custom/plugins/Ayon/Ayon.ico
rename to server_addon/deadline/client/ayon_deadline/repository/custom/plugins/Ayon/Ayon.ico
diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/Ayon/Ayon.options b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/Ayon/Ayon.options
similarity index 100%
rename from client/ayon_core/modules/deadline/repository/custom/plugins/Ayon/Ayon.options
rename to server_addon/deadline/client/ayon_deadline/repository/custom/plugins/Ayon/Ayon.options
diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/Ayon/Ayon.param b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/Ayon/Ayon.param
similarity index 100%
rename from client/ayon_core/modules/deadline/repository/custom/plugins/Ayon/Ayon.param
rename to server_addon/deadline/client/ayon_deadline/repository/custom/plugins/Ayon/Ayon.param
diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/Ayon/Ayon.py b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/Ayon/Ayon.py
similarity index 100%
rename from client/ayon_core/modules/deadline/repository/custom/plugins/Ayon/Ayon.py
rename to server_addon/deadline/client/ayon_deadline/repository/custom/plugins/Ayon/Ayon.py
diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/CelAction/CelAction.ico b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/CelAction/CelAction.ico
similarity index 100%
rename from client/ayon_core/modules/deadline/repository/custom/plugins/CelAction/CelAction.ico
rename to server_addon/deadline/client/ayon_deadline/repository/custom/plugins/CelAction/CelAction.ico
diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/CelAction/CelAction.param b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/CelAction/CelAction.param
similarity index 100%
rename from client/ayon_core/modules/deadline/repository/custom/plugins/CelAction/CelAction.param
rename to server_addon/deadline/client/ayon_deadline/repository/custom/plugins/CelAction/CelAction.param
diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/CelAction/CelAction.py b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/CelAction/CelAction.py
similarity index 100%
rename from client/ayon_core/modules/deadline/repository/custom/plugins/CelAction/CelAction.py
rename to server_addon/deadline/client/ayon_deadline/repository/custom/plugins/CelAction/CelAction.py
diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py
similarity index 100%
rename from client/ayon_core/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py
rename to server_addon/deadline/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py
diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/HarmonyAYON/HarmonyAYON.ico b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/HarmonyAYON/HarmonyAYON.ico
similarity index 100%
rename from client/ayon_core/modules/deadline/repository/custom/plugins/HarmonyAYON/HarmonyAYON.ico
rename to server_addon/deadline/client/ayon_deadline/repository/custom/plugins/HarmonyAYON/HarmonyAYON.ico
diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/HarmonyAYON/HarmonyAYON.options b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/HarmonyAYON/HarmonyAYON.options
similarity index 100%
rename from client/ayon_core/modules/deadline/repository/custom/plugins/HarmonyAYON/HarmonyAYON.options
rename to server_addon/deadline/client/ayon_deadline/repository/custom/plugins/HarmonyAYON/HarmonyAYON.options
diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/HarmonyAYON/HarmonyAYON.param b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/HarmonyAYON/HarmonyAYON.param
similarity index 100%
rename from client/ayon_core/modules/deadline/repository/custom/plugins/HarmonyAYON/HarmonyAYON.param
rename to server_addon/deadline/client/ayon_deadline/repository/custom/plugins/HarmonyAYON/HarmonyAYON.param
diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/HarmonyAYON/HarmonyAYON.py b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/HarmonyAYON/HarmonyAYON.py
similarity index 100%
rename from client/ayon_core/modules/deadline/repository/custom/plugins/HarmonyAYON/HarmonyAYON.py
rename to server_addon/deadline/client/ayon_deadline/repository/custom/plugins/HarmonyAYON/HarmonyAYON.py
diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.ico b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.ico
similarity index 100%
rename from client/ayon_core/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.ico
rename to server_addon/deadline/client/ayon_deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.ico
diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.options b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.options
similarity index 100%
rename from client/ayon_core/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.options
rename to server_addon/deadline/client/ayon_deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.options
diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.param b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.param
similarity index 100%
rename from client/ayon_core/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.param
rename to server_addon/deadline/client/ayon_deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.param
diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py
similarity index 100%
rename from client/ayon_core/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py
rename to server_addon/deadline/client/ayon_deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py
diff --git a/client/ayon_core/modules/deadline/repository/readme.md b/server_addon/deadline/client/ayon_deadline/repository/readme.md
similarity index 100%
rename from client/ayon_core/modules/deadline/repository/readme.md
rename to server_addon/deadline/client/ayon_deadline/repository/readme.md
diff --git a/client/ayon_core/modules/deadline/version.py b/server_addon/deadline/client/ayon_deadline/version.py
similarity index 100%
rename from client/ayon_core/modules/deadline/version.py
rename to server_addon/deadline/client/ayon_deadline/version.py