diff --git a/client/ayon_core/hosts/aftereffects/__init__.py b/server_addon/aftereffects/client/ayon_aftereffects/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/__init__.py
rename to server_addon/aftereffects/client/ayon_aftereffects/__init__.py
diff --git a/client/ayon_core/hosts/aftereffects/addon.py b/server_addon/aftereffects/client/ayon_aftereffects/addon.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/addon.py
rename to server_addon/aftereffects/client/ayon_aftereffects/addon.py
diff --git a/client/ayon_core/hosts/aftereffects/api/README.md b/server_addon/aftereffects/client/ayon_aftereffects/api/README.md
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/README.md
rename to server_addon/aftereffects/client/ayon_aftereffects/api/README.md
diff --git a/client/ayon_core/hosts/aftereffects/api/__init__.py b/server_addon/aftereffects/client/ayon_aftereffects/api/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/__init__.py
rename to server_addon/aftereffects/client/ayon_aftereffects/api/__init__.py
diff --git a/client/ayon_core/hosts/aftereffects/api/extension.zxp b/server_addon/aftereffects/client/ayon_aftereffects/api/extension.zxp
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/extension.zxp
rename to server_addon/aftereffects/client/ayon_aftereffects/api/extension.zxp
diff --git a/client/ayon_core/hosts/aftereffects/api/extension/.debug b/server_addon/aftereffects/client/ayon_aftereffects/api/extension/.debug
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/extension/.debug
rename to server_addon/aftereffects/client/ayon_aftereffects/api/extension/.debug
diff --git a/client/ayon_core/hosts/aftereffects/api/extension/CSXS/manifest.xml b/server_addon/aftereffects/client/ayon_aftereffects/api/extension/CSXS/manifest.xml
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/extension/CSXS/manifest.xml
rename to server_addon/aftereffects/client/ayon_aftereffects/api/extension/CSXS/manifest.xml
diff --git a/client/ayon_core/hosts/aftereffects/api/extension/css/boilerplate.css b/server_addon/aftereffects/client/ayon_aftereffects/api/extension/css/boilerplate.css
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/extension/css/boilerplate.css
rename to server_addon/aftereffects/client/ayon_aftereffects/api/extension/css/boilerplate.css
diff --git a/client/ayon_core/hosts/aftereffects/api/extension/css/styles.css b/server_addon/aftereffects/client/ayon_aftereffects/api/extension/css/styles.css
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/extension/css/styles.css
rename to server_addon/aftereffects/client/ayon_aftereffects/api/extension/css/styles.css
diff --git a/client/ayon_core/hosts/aftereffects/api/extension/css/topcoat-desktop-dark.min.css b/server_addon/aftereffects/client/ayon_aftereffects/api/extension/css/topcoat-desktop-dark.min.css
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/extension/css/topcoat-desktop-dark.min.css
rename to server_addon/aftereffects/client/ayon_aftereffects/api/extension/css/topcoat-desktop-dark.min.css
diff --git a/client/ayon_core/hosts/aftereffects/api/extension/icons/ayon_logo.png b/server_addon/aftereffects/client/ayon_aftereffects/api/extension/icons/ayon_logo.png
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/extension/icons/ayon_logo.png
rename to server_addon/aftereffects/client/ayon_aftereffects/api/extension/icons/ayon_logo.png
diff --git a/client/ayon_core/hosts/aftereffects/api/extension/icons/iconDarkNormal.png b/server_addon/aftereffects/client/ayon_aftereffects/api/extension/icons/iconDarkNormal.png
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/extension/icons/iconDarkNormal.png
rename to server_addon/aftereffects/client/ayon_aftereffects/api/extension/icons/iconDarkNormal.png
diff --git a/client/ayon_core/hosts/aftereffects/api/extension/icons/iconDarkRollover.png b/server_addon/aftereffects/client/ayon_aftereffects/api/extension/icons/iconDarkRollover.png
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/extension/icons/iconDarkRollover.png
rename to server_addon/aftereffects/client/ayon_aftereffects/api/extension/icons/iconDarkRollover.png
diff --git a/client/ayon_core/hosts/aftereffects/api/extension/icons/iconDisabled.png b/server_addon/aftereffects/client/ayon_aftereffects/api/extension/icons/iconDisabled.png
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/extension/icons/iconDisabled.png
rename to server_addon/aftereffects/client/ayon_aftereffects/api/extension/icons/iconDisabled.png
diff --git a/client/ayon_core/hosts/aftereffects/api/extension/icons/iconNormal.png b/server_addon/aftereffects/client/ayon_aftereffects/api/extension/icons/iconNormal.png
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/extension/icons/iconNormal.png
rename to server_addon/aftereffects/client/ayon_aftereffects/api/extension/icons/iconNormal.png
diff --git a/client/ayon_core/hosts/aftereffects/api/extension/icons/iconRollover.png b/server_addon/aftereffects/client/ayon_aftereffects/api/extension/icons/iconRollover.png
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/extension/icons/iconRollover.png
rename to server_addon/aftereffects/client/ayon_aftereffects/api/extension/icons/iconRollover.png
diff --git a/client/ayon_core/hosts/aftereffects/api/extension/index.html b/server_addon/aftereffects/client/ayon_aftereffects/api/extension/index.html
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/extension/index.html
rename to server_addon/aftereffects/client/ayon_aftereffects/api/extension/index.html
diff --git a/client/ayon_core/hosts/aftereffects/api/extension/js/libs/CSInterface.js b/server_addon/aftereffects/client/ayon_aftereffects/api/extension/js/libs/CSInterface.js
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/extension/js/libs/CSInterface.js
rename to server_addon/aftereffects/client/ayon_aftereffects/api/extension/js/libs/CSInterface.js
diff --git a/client/ayon_core/hosts/aftereffects/api/extension/js/libs/jquery-2.0.2.min.js b/server_addon/aftereffects/client/ayon_aftereffects/api/extension/js/libs/jquery-2.0.2.min.js
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/extension/js/libs/jquery-2.0.2.min.js
rename to server_addon/aftereffects/client/ayon_aftereffects/api/extension/js/libs/jquery-2.0.2.min.js
diff --git a/client/ayon_core/hosts/aftereffects/api/extension/js/libs/json.js b/server_addon/aftereffects/client/ayon_aftereffects/api/extension/js/libs/json.js
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/extension/js/libs/json.js
rename to server_addon/aftereffects/client/ayon_aftereffects/api/extension/js/libs/json.js
diff --git a/client/ayon_core/hosts/aftereffects/api/extension/js/libs/loglevel.min.js b/server_addon/aftereffects/client/ayon_aftereffects/api/extension/js/libs/loglevel.min.js
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/extension/js/libs/loglevel.min.js
rename to server_addon/aftereffects/client/ayon_aftereffects/api/extension/js/libs/loglevel.min.js
diff --git a/client/ayon_core/hosts/aftereffects/api/extension/js/libs/wsrpc.js b/server_addon/aftereffects/client/ayon_aftereffects/api/extension/js/libs/wsrpc.js
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/extension/js/libs/wsrpc.js
rename to server_addon/aftereffects/client/ayon_aftereffects/api/extension/js/libs/wsrpc.js
diff --git a/client/ayon_core/hosts/aftereffects/api/extension/js/libs/wsrpc.min.js b/server_addon/aftereffects/client/ayon_aftereffects/api/extension/js/libs/wsrpc.min.js
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/extension/js/libs/wsrpc.min.js
rename to server_addon/aftereffects/client/ayon_aftereffects/api/extension/js/libs/wsrpc.min.js
diff --git a/client/ayon_core/hosts/aftereffects/api/extension/js/main.js b/server_addon/aftereffects/client/ayon_aftereffects/api/extension/js/main.js
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/extension/js/main.js
rename to server_addon/aftereffects/client/ayon_aftereffects/api/extension/js/main.js
diff --git a/client/ayon_core/hosts/aftereffects/api/extension/js/themeManager.js b/server_addon/aftereffects/client/ayon_aftereffects/api/extension/js/themeManager.js
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/extension/js/themeManager.js
rename to server_addon/aftereffects/client/ayon_aftereffects/api/extension/js/themeManager.js
diff --git a/client/ayon_core/hosts/aftereffects/api/extension/jsx/hostscript.jsx b/server_addon/aftereffects/client/ayon_aftereffects/api/extension/jsx/hostscript.jsx
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/extension/jsx/hostscript.jsx
rename to server_addon/aftereffects/client/ayon_aftereffects/api/extension/jsx/hostscript.jsx
diff --git a/client/ayon_core/hosts/aftereffects/api/launch_logic.py b/server_addon/aftereffects/client/ayon_aftereffects/api/launch_logic.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/launch_logic.py
rename to server_addon/aftereffects/client/ayon_aftereffects/api/launch_logic.py
diff --git a/client/ayon_core/hosts/aftereffects/api/launch_script.py b/server_addon/aftereffects/client/ayon_aftereffects/api/launch_script.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/launch_script.py
rename to server_addon/aftereffects/client/ayon_aftereffects/api/launch_script.py
diff --git a/client/ayon_core/hosts/aftereffects/api/lib.py b/server_addon/aftereffects/client/ayon_aftereffects/api/lib.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/lib.py
rename to server_addon/aftereffects/client/ayon_aftereffects/api/lib.py
diff --git a/client/ayon_core/hosts/aftereffects/api/panel.png b/server_addon/aftereffects/client/ayon_aftereffects/api/panel.png
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/panel.png
rename to server_addon/aftereffects/client/ayon_aftereffects/api/panel.png
diff --git a/client/ayon_core/hosts/aftereffects/api/panel_failure.png b/server_addon/aftereffects/client/ayon_aftereffects/api/panel_failure.png
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/panel_failure.png
rename to server_addon/aftereffects/client/ayon_aftereffects/api/panel_failure.png
diff --git a/client/ayon_core/hosts/aftereffects/api/pipeline.py b/server_addon/aftereffects/client/ayon_aftereffects/api/pipeline.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/pipeline.py
rename to server_addon/aftereffects/client/ayon_aftereffects/api/pipeline.py
diff --git a/client/ayon_core/hosts/aftereffects/api/plugin.py b/server_addon/aftereffects/client/ayon_aftereffects/api/plugin.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/plugin.py
rename to server_addon/aftereffects/client/ayon_aftereffects/api/plugin.py
diff --git a/client/ayon_core/hosts/aftereffects/api/workfile_template_builder.py b/server_addon/aftereffects/client/ayon_aftereffects/api/workfile_template_builder.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/workfile_template_builder.py
rename to server_addon/aftereffects/client/ayon_aftereffects/api/workfile_template_builder.py
diff --git a/client/ayon_core/hosts/aftereffects/api/ws_stub.py b/server_addon/aftereffects/client/ayon_aftereffects/api/ws_stub.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/api/ws_stub.py
rename to server_addon/aftereffects/client/ayon_aftereffects/api/ws_stub.py
diff --git a/client/ayon_core/hosts/aftereffects/hooks/pre_launch_args.py b/server_addon/aftereffects/client/ayon_aftereffects/hooks/pre_launch_args.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/hooks/pre_launch_args.py
rename to server_addon/aftereffects/client/ayon_aftereffects/hooks/pre_launch_args.py
diff --git a/client/ayon_core/hosts/aftereffects/plugins/__init__.py b/server_addon/aftereffects/client/ayon_aftereffects/plugins/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/plugins/__init__.py
rename to server_addon/aftereffects/client/ayon_aftereffects/plugins/__init__.py
diff --git a/client/ayon_core/hosts/aftereffects/plugins/create/create_render.py b/server_addon/aftereffects/client/ayon_aftereffects/plugins/create/create_render.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/plugins/create/create_render.py
rename to server_addon/aftereffects/client/ayon_aftereffects/plugins/create/create_render.py
diff --git a/client/ayon_core/hosts/aftereffects/plugins/create/workfile_creator.py b/server_addon/aftereffects/client/ayon_aftereffects/plugins/create/workfile_creator.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/plugins/create/workfile_creator.py
rename to server_addon/aftereffects/client/ayon_aftereffects/plugins/create/workfile_creator.py
diff --git a/client/ayon_core/hosts/aftereffects/plugins/load/load_background.py b/server_addon/aftereffects/client/ayon_aftereffects/plugins/load/load_background.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/plugins/load/load_background.py
rename to server_addon/aftereffects/client/ayon_aftereffects/plugins/load/load_background.py
diff --git a/client/ayon_core/hosts/aftereffects/plugins/load/load_file.py b/server_addon/aftereffects/client/ayon_aftereffects/plugins/load/load_file.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/plugins/load/load_file.py
rename to server_addon/aftereffects/client/ayon_aftereffects/plugins/load/load_file.py
diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/add_publish_highlight.py b/server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/add_publish_highlight.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/plugins/publish/add_publish_highlight.py
rename to server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/add_publish_highlight.py
diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/closeAE.py b/server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/closeAE.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/plugins/publish/closeAE.py
rename to server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/closeAE.py
diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/collect_audio.py b/server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/collect_audio.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/plugins/publish/collect_audio.py
rename to server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/collect_audio.py
diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/collect_current_file.py b/server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/collect_current_file.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/plugins/publish/collect_current_file.py
rename to server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/collect_current_file.py
diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/collect_extension_version.py b/server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/collect_extension_version.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/plugins/publish/collect_extension_version.py
rename to server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/collect_extension_version.py
diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/collect_render.py b/server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/collect_render.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/plugins/publish/collect_render.py
rename to server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/collect_render.py
diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/collect_review.py b/server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/collect_review.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/plugins/publish/collect_review.py
rename to server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/collect_review.py
diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/collect_workfile.py b/server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/collect_workfile.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/plugins/publish/collect_workfile.py
rename to server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/collect_workfile.py
diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/extract_local_render.py b/server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/extract_local_render.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/plugins/publish/extract_local_render.py
rename to server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/extract_local_render.py
diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/extract_save_scene.py b/server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/extract_save_scene.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/plugins/publish/extract_save_scene.py
rename to server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/extract_save_scene.py
diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/help/validate_footage_items.xml b/server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/help/validate_footage_items.xml
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/plugins/publish/help/validate_footage_items.xml
rename to server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/help/validate_footage_items.xml
diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/help/validate_instance_asset.xml b/server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/help/validate_instance_asset.xml
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/plugins/publish/help/validate_instance_asset.xml
rename to server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/help/validate_instance_asset.xml
diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/help/validate_scene_settings.xml b/server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/help/validate_scene_settings.xml
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/plugins/publish/help/validate_scene_settings.xml
rename to server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/help/validate_scene_settings.xml
diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/increment_workfile.py b/server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/increment_workfile.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/plugins/publish/increment_workfile.py
rename to server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/increment_workfile.py
diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/remove_publish_highlight.py b/server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/remove_publish_highlight.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/plugins/publish/remove_publish_highlight.py
rename to server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/remove_publish_highlight.py
diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/validate_footage_items.py b/server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/validate_footage_items.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/plugins/publish/validate_footage_items.py
rename to server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/validate_footage_items.py
diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/validate_instance_asset.py b/server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/validate_instance_asset.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/plugins/publish/validate_instance_asset.py
rename to server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/validate_instance_asset.py
diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/validate_scene_settings.py b/server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/validate_scene_settings.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/plugins/publish/validate_scene_settings.py
rename to server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/validate_scene_settings.py
diff --git a/client/ayon_core/hosts/aftereffects/plugins/workfile_build/create_placeholder.py b/server_addon/aftereffects/client/ayon_aftereffects/plugins/workfile_build/create_placeholder.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/plugins/workfile_build/create_placeholder.py
rename to server_addon/aftereffects/client/ayon_aftereffects/plugins/workfile_build/create_placeholder.py
diff --git a/client/ayon_core/hosts/aftereffects/plugins/workfile_build/load_placeholder.py b/server_addon/aftereffects/client/ayon_aftereffects/plugins/workfile_build/load_placeholder.py
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/plugins/workfile_build/load_placeholder.py
rename to server_addon/aftereffects/client/ayon_aftereffects/plugins/workfile_build/load_placeholder.py
diff --git a/client/ayon_core/hosts/aftereffects/resources/template.aep b/server_addon/aftereffects/client/ayon_aftereffects/resources/template.aep
similarity index 100%
rename from client/ayon_core/hosts/aftereffects/resources/template.aep
rename to server_addon/aftereffects/client/ayon_aftereffects/resources/template.aep