diff --git a/client/ayon_core/addon/base.py b/client/ayon_core/addon/base.py
index b8b96688f0..c4407424cc 100644
--- a/client/ayon_core/addon/base.py
+++ b/client/ayon_core/addon/base.py
@@ -65,6 +65,7 @@ MOVED_ADDON_MILESTONE_VERSIONS = {
     "maya": VersionInfo(0, 2, 0),
     "nuke": VersionInfo(0, 2, 0),
     "resolve": VersionInfo(0, 2, 0),
+    "royalrender": VersionInfo(0, 2, 0),
     "substancepainter": VersionInfo(0, 2, 0),
     "houdini": VersionInfo(0, 3, 0),
 }
diff --git a/client/ayon_core/modules/royalrender/version.py b/client/ayon_core/modules/royalrender/version.py
deleted file mode 100644
index 485f44ac21..0000000000
--- a/client/ayon_core/modules/royalrender/version.py
+++ /dev/null
@@ -1 +0,0 @@
-__version__ = "0.1.1"
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 99%
rename from client/ayon_core/modules/royalrender/lib.py
rename to server_addon/royalrender/client/ayon_royalrender/lib.py
index 82bc96e759..ec67cfa29e 100644
--- a/client/ayon_core/modules/royalrender/lib.py
+++ b/server_addon/royalrender/client/ayon_royalrender/lib.py
@@ -16,8 +16,8 @@ from ayon_core.lib import (
     is_in_tests,
 )
 from ayon_core.lib.execute import run_ayon_launcher_process
-from ayon_core.modules.royalrender.api import Api as rrApi
-from ayon_core.modules.royalrender.rr_job import (
+from ayon_royalrender.api import Api as rrApi
+from ayon_royalrender.rr_job import (
     CustomAttribute,
     RRJob,
     RREnvList,
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 96%
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
index 7fad573a8b..e3c3ddc74b 100644
--- 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
@@ -8,7 +8,7 @@ Provides:
 import os.path
 
 import pyblish.api
-from ayon_core.modules.royalrender.rr_job import get_rr_platform
+from ayon_royalrender.rr_job import get_rr_platform
 
 
 class CollectRRPathFromInstance(pyblish.api.InstancePlugin):
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 96%
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
index d205b32b7d..4e52e8e24b 100644
--- 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
@@ -4,7 +4,7 @@ import os
 
 from maya.OpenMaya import MGlobal  # noqa: F401
 
-from ayon_core.modules.royalrender import lib
+from ayon_royalrender import lib
 from ayon_core.pipeline.farm.tools import iter_expected_files
 
 
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 98%
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
index 9a3bf3624b..442485d211 100644
--- 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
@@ -2,7 +2,7 @@
 """Submitting render job to RoyalRender."""
 import re
 
-from ayon_core.modules.royalrender import lib
+from ayon_royalrender import lib
 
 
 class CreateNukeRoyalRenderJob(lib.BaseCreateRoyalRenderJob):
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 99%
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
index 51500f84f5..0bc092ecd8 100644
--- 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
@@ -6,7 +6,7 @@ import json
 
 import pyblish.api
 
-from ayon_core.modules.royalrender.rr_job import (
+from ayon_royalrender.rr_job import (
     RRJob,
     RREnvList,
     get_rr_platform
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 98%
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
index 09c1dc4a54..72a27dab2d 100644
--- 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
@@ -3,7 +3,7 @@
 import tempfile
 
 import pyblish.api
-from ayon_core.modules.royalrender.api import (
+from ayon_royalrender.api import (
     RRJob,
     Api as rrApi,
     SubmitterParameter
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/server_addon/royalrender/client/ayon_royalrender/version.py b/server_addon/royalrender/client/ayon_royalrender/version.py
new file mode 100644
index 0000000000..4528939205
--- /dev/null
+++ b/server_addon/royalrender/client/ayon_royalrender/version.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+"""Package declaring AYON addon 'royalrender' version."""
+__version__ = "0.2.0"
diff --git a/server_addon/royalrender/package.py b/server_addon/royalrender/package.py
index 1fdea4abbb..2a07b59f65 100644
--- a/server_addon/royalrender/package.py
+++ b/server_addon/royalrender/package.py
@@ -1,3 +1,10 @@
 name = "royalrender"
 title = "Royal Render"
-version = "0.1.1"
+version = "0.2.0"
+
+client_dir = "ayon_royalrender"
+
+ayon_required_addons = {
+    "core": ">0.3.2",
+}
+ayon_compatible_addons = {}