diff --git a/client/ayon_core/modules/royalrender/__init__.py b/server_addon/royalrender/client/ayon_royalrender/__init__.py
similarity index 100%
rename from client/ayon_core/modules/royalrender/__init__.py
rename to server_addon/royalrender/client/ayon_royalrender/__init__.py
diff --git a/client/ayon_core/modules/royalrender/addon.py b/server_addon/royalrender/client/ayon_royalrender/addon.py
similarity index 100%
rename from client/ayon_core/modules/royalrender/addon.py
rename to server_addon/royalrender/client/ayon_royalrender/addon.py
diff --git a/client/ayon_core/modules/royalrender/api.py b/server_addon/royalrender/client/ayon_royalrender/api.py
similarity index 100%
rename from client/ayon_core/modules/royalrender/api.py
rename to server_addon/royalrender/client/ayon_royalrender/api.py
diff --git a/client/ayon_core/modules/royalrender/lib.py b/server_addon/royalrender/client/ayon_royalrender/lib.py
similarity index 100%
rename from client/ayon_core/modules/royalrender/lib.py
rename to server_addon/royalrender/client/ayon_royalrender/lib.py
diff --git a/client/ayon_core/modules/royalrender/plugins/publish/collect_rr_path_from_instance.py b/server_addon/royalrender/client/ayon_royalrender/plugins/publish/collect_rr_path_from_instance.py
similarity index 100%
rename from client/ayon_core/modules/royalrender/plugins/publish/collect_rr_path_from_instance.py
rename to server_addon/royalrender/client/ayon_royalrender/plugins/publish/collect_rr_path_from_instance.py
diff --git a/client/ayon_core/modules/royalrender/plugins/publish/collect_sequences_from_job.py b/server_addon/royalrender/client/ayon_royalrender/plugins/publish/collect_sequences_from_job.py
similarity index 100%
rename from client/ayon_core/modules/royalrender/plugins/publish/collect_sequences_from_job.py
rename to server_addon/royalrender/client/ayon_royalrender/plugins/publish/collect_sequences_from_job.py
diff --git a/client/ayon_core/modules/royalrender/plugins/publish/create_maya_royalrender_job.py b/server_addon/royalrender/client/ayon_royalrender/plugins/publish/create_maya_royalrender_job.py
similarity index 100%
rename from client/ayon_core/modules/royalrender/plugins/publish/create_maya_royalrender_job.py
rename to server_addon/royalrender/client/ayon_royalrender/plugins/publish/create_maya_royalrender_job.py
diff --git a/client/ayon_core/modules/royalrender/plugins/publish/create_nuke_royalrender_job.py b/server_addon/royalrender/client/ayon_royalrender/plugins/publish/create_nuke_royalrender_job.py
similarity index 100%
rename from client/ayon_core/modules/royalrender/plugins/publish/create_nuke_royalrender_job.py
rename to server_addon/royalrender/client/ayon_royalrender/plugins/publish/create_nuke_royalrender_job.py
diff --git a/client/ayon_core/modules/royalrender/plugins/publish/create_publish_royalrender_job.py b/server_addon/royalrender/client/ayon_royalrender/plugins/publish/create_publish_royalrender_job.py
similarity index 100%
rename from client/ayon_core/modules/royalrender/plugins/publish/create_publish_royalrender_job.py
rename to server_addon/royalrender/client/ayon_royalrender/plugins/publish/create_publish_royalrender_job.py
diff --git a/client/ayon_core/modules/royalrender/plugins/publish/submit_jobs_to_royalrender.py b/server_addon/royalrender/client/ayon_royalrender/plugins/publish/submit_jobs_to_royalrender.py
similarity index 100%
rename from client/ayon_core/modules/royalrender/plugins/publish/submit_jobs_to_royalrender.py
rename to server_addon/royalrender/client/ayon_royalrender/plugins/publish/submit_jobs_to_royalrender.py
diff --git a/client/ayon_core/modules/royalrender/rr_job.py b/server_addon/royalrender/client/ayon_royalrender/rr_job.py
similarity index 100%
rename from client/ayon_core/modules/royalrender/rr_job.py
rename to server_addon/royalrender/client/ayon_royalrender/rr_job.py
diff --git a/client/ayon_core/modules/royalrender/rr_root/README.md b/server_addon/royalrender/client/ayon_royalrender/rr_root/README.md
similarity index 100%
rename from client/ayon_core/modules/royalrender/rr_root/README.md
rename to server_addon/royalrender/client/ayon_royalrender/rr_root/README.md
diff --git a/client/ayon_core/modules/royalrender/rr_root/plugins/control_job/perjob/m50__openpype_publish_render.py b/server_addon/royalrender/client/ayon_royalrender/rr_root/plugins/control_job/perjob/m50__openpype_publish_render.py
similarity index 100%
rename from client/ayon_core/modules/royalrender/rr_root/plugins/control_job/perjob/m50__openpype_publish_render.py
rename to server_addon/royalrender/client/ayon_royalrender/rr_root/plugins/control_job/perjob/m50__openpype_publish_render.py
diff --git a/client/ayon_core/modules/royalrender/rr_root/render_apps/_config/E01__OpenPype.png b/server_addon/royalrender/client/ayon_royalrender/rr_root/render_apps/_config/E01__OpenPype.png
similarity index 100%
rename from client/ayon_core/modules/royalrender/rr_root/render_apps/_config/E01__OpenPype.png
rename to server_addon/royalrender/client/ayon_royalrender/rr_root/render_apps/_config/E01__OpenPype.png
diff --git a/client/ayon_core/modules/royalrender/rr_root/render_apps/_config/E01__OpenPype__PublishJob.cfg b/server_addon/royalrender/client/ayon_royalrender/rr_root/render_apps/_config/E01__OpenPype__PublishJob.cfg
similarity index 100%
rename from client/ayon_core/modules/royalrender/rr_root/render_apps/_config/E01__OpenPype__PublishJob.cfg
rename to server_addon/royalrender/client/ayon_royalrender/rr_root/render_apps/_config/E01__OpenPype__PublishJob.cfg
diff --git a/client/ayon_core/modules/royalrender/rr_root/render_apps/_config/E01__OpenPype___global.inc b/server_addon/royalrender/client/ayon_royalrender/rr_root/render_apps/_config/E01__OpenPype___global.inc
similarity index 100%
rename from client/ayon_core/modules/royalrender/rr_root/render_apps/_config/E01__OpenPype___global.inc
rename to server_addon/royalrender/client/ayon_royalrender/rr_root/render_apps/_config/E01__OpenPype___global.inc
diff --git a/client/ayon_core/modules/royalrender/rr_root/render_apps/_install_paths/OpenPype.cfg b/server_addon/royalrender/client/ayon_royalrender/rr_root/render_apps/_install_paths/OpenPype.cfg
similarity index 100%
rename from client/ayon_core/modules/royalrender/rr_root/render_apps/_install_paths/OpenPype.cfg
rename to server_addon/royalrender/client/ayon_royalrender/rr_root/render_apps/_install_paths/OpenPype.cfg
diff --git a/client/ayon_core/modules/royalrender/rr_root/render_apps/_prepost_scripts/OpenPypeEnvironment.cfg b/server_addon/royalrender/client/ayon_royalrender/rr_root/render_apps/_prepost_scripts/OpenPypeEnvironment.cfg
similarity index 100%
rename from client/ayon_core/modules/royalrender/rr_root/render_apps/_prepost_scripts/OpenPypeEnvironment.cfg
rename to server_addon/royalrender/client/ayon_royalrender/rr_root/render_apps/_prepost_scripts/OpenPypeEnvironment.cfg
diff --git a/client/ayon_core/modules/royalrender/rr_root/render_apps/_prepost_scripts/PreOpenPypeInjectEnvironments.py b/server_addon/royalrender/client/ayon_royalrender/rr_root/render_apps/_prepost_scripts/PreOpenPypeInjectEnvironments.py
similarity index 100%
rename from client/ayon_core/modules/royalrender/rr_root/render_apps/_prepost_scripts/PreOpenPypeInjectEnvironments.py
rename to server_addon/royalrender/client/ayon_royalrender/rr_root/render_apps/_prepost_scripts/PreOpenPypeInjectEnvironments.py
diff --git a/client/ayon_core/modules/royalrender/version.py b/server_addon/royalrender/client/ayon_royalrender/version.py
similarity index 100%
rename from client/ayon_core/modules/royalrender/version.py
rename to server_addon/royalrender/client/ayon_royalrender/version.py