diff --git a/client/ayon_core/hosts/flame/__init__.py b/server_addon/flame/client/ayon_flame/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/flame/__init__.py
rename to server_addon/flame/client/ayon_flame/__init__.py
diff --git a/client/ayon_core/hosts/flame/addon.py b/server_addon/flame/client/ayon_flame/addon.py
similarity index 100%
rename from client/ayon_core/hosts/flame/addon.py
rename to server_addon/flame/client/ayon_flame/addon.py
diff --git a/client/ayon_core/hosts/flame/api/__init__.py b/server_addon/flame/client/ayon_flame/api/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/flame/api/__init__.py
rename to server_addon/flame/client/ayon_flame/api/__init__.py
diff --git a/client/ayon_core/hosts/flame/api/batch_utils.py b/server_addon/flame/client/ayon_flame/api/batch_utils.py
similarity index 100%
rename from client/ayon_core/hosts/flame/api/batch_utils.py
rename to server_addon/flame/client/ayon_flame/api/batch_utils.py
diff --git a/client/ayon_core/hosts/flame/api/constants.py b/server_addon/flame/client/ayon_flame/api/constants.py
similarity index 100%
rename from client/ayon_core/hosts/flame/api/constants.py
rename to server_addon/flame/client/ayon_flame/api/constants.py
diff --git a/client/ayon_core/hosts/flame/api/lib.py b/server_addon/flame/client/ayon_flame/api/lib.py
similarity index 100%
rename from client/ayon_core/hosts/flame/api/lib.py
rename to server_addon/flame/client/ayon_flame/api/lib.py
diff --git a/client/ayon_core/hosts/flame/api/menu.py b/server_addon/flame/client/ayon_flame/api/menu.py
similarity index 100%
rename from client/ayon_core/hosts/flame/api/menu.py
rename to server_addon/flame/client/ayon_flame/api/menu.py
diff --git a/client/ayon_core/hosts/flame/api/pipeline.py b/server_addon/flame/client/ayon_flame/api/pipeline.py
similarity index 100%
rename from client/ayon_core/hosts/flame/api/pipeline.py
rename to server_addon/flame/client/ayon_flame/api/pipeline.py
diff --git a/client/ayon_core/hosts/flame/api/plugin.py b/server_addon/flame/client/ayon_flame/api/plugin.py
similarity index 100%
rename from client/ayon_core/hosts/flame/api/plugin.py
rename to server_addon/flame/client/ayon_flame/api/plugin.py
diff --git a/client/ayon_core/hosts/flame/api/render_utils.py b/server_addon/flame/client/ayon_flame/api/render_utils.py
similarity index 100%
rename from client/ayon_core/hosts/flame/api/render_utils.py
rename to server_addon/flame/client/ayon_flame/api/render_utils.py
diff --git a/client/ayon_core/hosts/flame/api/scripts/wiretap_com.py b/server_addon/flame/client/ayon_flame/api/scripts/wiretap_com.py
similarity index 100%
rename from client/ayon_core/hosts/flame/api/scripts/wiretap_com.py
rename to server_addon/flame/client/ayon_flame/api/scripts/wiretap_com.py
diff --git a/client/ayon_core/hosts/flame/api/utils.py b/server_addon/flame/client/ayon_flame/api/utils.py
similarity index 100%
rename from client/ayon_core/hosts/flame/api/utils.py
rename to server_addon/flame/client/ayon_flame/api/utils.py
diff --git a/client/ayon_core/hosts/flame/api/workio.py b/server_addon/flame/client/ayon_flame/api/workio.py
similarity index 100%
rename from client/ayon_core/hosts/flame/api/workio.py
rename to server_addon/flame/client/ayon_flame/api/workio.py
diff --git a/client/ayon_core/hosts/flame/hooks/pre_flame_setup.py b/server_addon/flame/client/ayon_flame/hooks/pre_flame_setup.py
similarity index 100%
rename from client/ayon_core/hosts/flame/hooks/pre_flame_setup.py
rename to server_addon/flame/client/ayon_flame/hooks/pre_flame_setup.py
diff --git a/client/ayon_core/hosts/flame/otio/__init__.py b/server_addon/flame/client/ayon_flame/otio/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/flame/otio/__init__.py
rename to server_addon/flame/client/ayon_flame/otio/__init__.py
diff --git a/client/ayon_core/hosts/flame/otio/flame_export.py b/server_addon/flame/client/ayon_flame/otio/flame_export.py
similarity index 100%
rename from client/ayon_core/hosts/flame/otio/flame_export.py
rename to server_addon/flame/client/ayon_flame/otio/flame_export.py
diff --git a/client/ayon_core/hosts/flame/otio/utils.py b/server_addon/flame/client/ayon_flame/otio/utils.py
similarity index 100%
rename from client/ayon_core/hosts/flame/otio/utils.py
rename to server_addon/flame/client/ayon_flame/otio/utils.py
diff --git a/client/ayon_core/hosts/flame/plugins/create/create_shot_clip.py b/server_addon/flame/client/ayon_flame/plugins/create/create_shot_clip.py
similarity index 100%
rename from client/ayon_core/hosts/flame/plugins/create/create_shot_clip.py
rename to server_addon/flame/client/ayon_flame/plugins/create/create_shot_clip.py
diff --git a/client/ayon_core/hosts/flame/plugins/load/load_clip.py b/server_addon/flame/client/ayon_flame/plugins/load/load_clip.py
similarity index 100%
rename from client/ayon_core/hosts/flame/plugins/load/load_clip.py
rename to server_addon/flame/client/ayon_flame/plugins/load/load_clip.py
diff --git a/client/ayon_core/hosts/flame/plugins/load/load_clip_batch.py b/server_addon/flame/client/ayon_flame/plugins/load/load_clip_batch.py
similarity index 100%
rename from client/ayon_core/hosts/flame/plugins/load/load_clip_batch.py
rename to server_addon/flame/client/ayon_flame/plugins/load/load_clip_batch.py
diff --git a/client/ayon_core/hosts/flame/plugins/publish/collect_test_selection.py b/server_addon/flame/client/ayon_flame/plugins/publish/collect_test_selection.py
similarity index 100%
rename from client/ayon_core/hosts/flame/plugins/publish/collect_test_selection.py
rename to server_addon/flame/client/ayon_flame/plugins/publish/collect_test_selection.py
diff --git a/client/ayon_core/hosts/flame/plugins/publish/collect_timeline_instances.py b/server_addon/flame/client/ayon_flame/plugins/publish/collect_timeline_instances.py
similarity index 100%
rename from client/ayon_core/hosts/flame/plugins/publish/collect_timeline_instances.py
rename to server_addon/flame/client/ayon_flame/plugins/publish/collect_timeline_instances.py
diff --git a/client/ayon_core/hosts/flame/plugins/publish/collect_timeline_otio.py b/server_addon/flame/client/ayon_flame/plugins/publish/collect_timeline_otio.py
similarity index 100%
rename from client/ayon_core/hosts/flame/plugins/publish/collect_timeline_otio.py
rename to server_addon/flame/client/ayon_flame/plugins/publish/collect_timeline_otio.py
diff --git a/client/ayon_core/hosts/flame/plugins/publish/extract_otio_file.py b/server_addon/flame/client/ayon_flame/plugins/publish/extract_otio_file.py
similarity index 100%
rename from client/ayon_core/hosts/flame/plugins/publish/extract_otio_file.py
rename to server_addon/flame/client/ayon_flame/plugins/publish/extract_otio_file.py
diff --git a/client/ayon_core/hosts/flame/plugins/publish/extract_subset_resources.py b/server_addon/flame/client/ayon_flame/plugins/publish/extract_subset_resources.py
similarity index 100%
rename from client/ayon_core/hosts/flame/plugins/publish/extract_subset_resources.py
rename to server_addon/flame/client/ayon_flame/plugins/publish/extract_subset_resources.py
diff --git a/client/ayon_core/hosts/flame/plugins/publish/integrate_batch_group.py b/server_addon/flame/client/ayon_flame/plugins/publish/integrate_batch_group.py
similarity index 100%
rename from client/ayon_core/hosts/flame/plugins/publish/integrate_batch_group.py
rename to server_addon/flame/client/ayon_flame/plugins/publish/integrate_batch_group.py
diff --git a/client/ayon_core/hosts/flame/startup/openpype_babypublisher/export_preset/openpype_seg_thumbnails_jpg.xml b/server_addon/flame/client/ayon_flame/startup/openpype_babypublisher/export_preset/openpype_seg_thumbnails_jpg.xml
similarity index 100%
rename from client/ayon_core/hosts/flame/startup/openpype_babypublisher/export_preset/openpype_seg_thumbnails_jpg.xml
rename to server_addon/flame/client/ayon_flame/startup/openpype_babypublisher/export_preset/openpype_seg_thumbnails_jpg.xml
diff --git a/client/ayon_core/hosts/flame/startup/openpype_babypublisher/export_preset/openpype_seg_video_h264.xml b/server_addon/flame/client/ayon_flame/startup/openpype_babypublisher/export_preset/openpype_seg_video_h264.xml
similarity index 100%
rename from client/ayon_core/hosts/flame/startup/openpype_babypublisher/export_preset/openpype_seg_video_h264.xml
rename to server_addon/flame/client/ayon_flame/startup/openpype_babypublisher/export_preset/openpype_seg_video_h264.xml
diff --git a/client/ayon_core/hosts/flame/startup/openpype_babypublisher/modules/__init__.py b/server_addon/flame/client/ayon_flame/startup/openpype_babypublisher/modules/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/flame/startup/openpype_babypublisher/modules/__init__.py
rename to server_addon/flame/client/ayon_flame/startup/openpype_babypublisher/modules/__init__.py
diff --git a/client/ayon_core/hosts/flame/startup/openpype_babypublisher/modules/app_utils.py b/server_addon/flame/client/ayon_flame/startup/openpype_babypublisher/modules/app_utils.py
similarity index 100%
rename from client/ayon_core/hosts/flame/startup/openpype_babypublisher/modules/app_utils.py
rename to server_addon/flame/client/ayon_flame/startup/openpype_babypublisher/modules/app_utils.py
diff --git a/client/ayon_core/hosts/flame/startup/openpype_babypublisher/modules/ftrack_lib.py b/server_addon/flame/client/ayon_flame/startup/openpype_babypublisher/modules/ftrack_lib.py
similarity index 100%
rename from client/ayon_core/hosts/flame/startup/openpype_babypublisher/modules/ftrack_lib.py
rename to server_addon/flame/client/ayon_flame/startup/openpype_babypublisher/modules/ftrack_lib.py
diff --git a/client/ayon_core/hosts/flame/startup/openpype_babypublisher/modules/panel_app.py b/server_addon/flame/client/ayon_flame/startup/openpype_babypublisher/modules/panel_app.py
similarity index 100%
rename from client/ayon_core/hosts/flame/startup/openpype_babypublisher/modules/panel_app.py
rename to server_addon/flame/client/ayon_flame/startup/openpype_babypublisher/modules/panel_app.py
diff --git a/client/ayon_core/hosts/flame/startup/openpype_babypublisher/modules/uiwidgets.py b/server_addon/flame/client/ayon_flame/startup/openpype_babypublisher/modules/uiwidgets.py
similarity index 100%
rename from client/ayon_core/hosts/flame/startup/openpype_babypublisher/modules/uiwidgets.py
rename to server_addon/flame/client/ayon_flame/startup/openpype_babypublisher/modules/uiwidgets.py
diff --git a/client/ayon_core/hosts/flame/startup/openpype_babypublisher/openpype_babypublisher.py b/server_addon/flame/client/ayon_flame/startup/openpype_babypublisher/openpype_babypublisher.py
similarity index 100%
rename from client/ayon_core/hosts/flame/startup/openpype_babypublisher/openpype_babypublisher.py
rename to server_addon/flame/client/ayon_flame/startup/openpype_babypublisher/openpype_babypublisher.py
diff --git a/client/ayon_core/hosts/flame/startup/openpype_in_flame.py b/server_addon/flame/client/ayon_flame/startup/openpype_in_flame.py
similarity index 100%
rename from client/ayon_core/hosts/flame/startup/openpype_in_flame.py
rename to server_addon/flame/client/ayon_flame/startup/openpype_in_flame.py