diff --git a/client/ayon_core/addon/base.py b/client/ayon_core/addon/base.py
index a257c83b09..c4407424cc 100644
--- a/client/ayon_core/addon/base.py
+++ b/client/ayon_core/addon/base.py
@@ -49,6 +49,7 @@ IGNORED_MODULES_IN_AYON = set()
 # When addon was moved from ayon-core codebase
 # - this is used to log the missing addon
 MOVED_ADDON_MILESTONE_VERSIONS = {
+    "aftereffects": VersionInfo(0, 2, 0),
     "applications": VersionInfo(0, 2, 0),
     "blender": VersionInfo(0, 2, 0),
     "celaction": VersionInfo(0, 2, 0),
diff --git a/client/ayon_core/tools/adobe_webserver/readme.txt b/client/ayon_core/tools/adobe_webserver/readme.txt
deleted file mode 100644
index d02d390277..0000000000
--- a/client/ayon_core/tools/adobe_webserver/readme.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Adobe webserver
----------------
-Aiohttp (Asyncio) based websocket server used for communication with host
-applications, currently only for Adobe (but could be used for any non python
-DCC which has websocket client).
-
-This webserver is started in spawned Python process that opens DCC during
-its launch, waits for connection from DCC and handles communication going
-forward. Server is closed before Python process is killed.
-
-(Different from `ayon_core/modules/webserver` as that one is running in Tray,
-this one is running in spawn Python process.)
\ No newline at end of file
diff --git a/client/ayon_core/tools/loader/control.py b/client/ayon_core/tools/loader/control.py
index 35188369c2..9fead226f0 100644
--- a/client/ayon_core/tools/loader/control.py
+++ b/client/ayon_core/tools/loader/control.py
@@ -348,10 +348,18 @@ class LoaderController(BackendLoaderController, FrontendLoaderController):
             return set()
 
         if not self._loaded_products_cache.is_valid:
-            if isinstance(self._host, ILoadHost):
-                containers = self._host.get_containers()
-            else:
-                containers = self._host.ls()
+            try:
+                if isinstance(self._host, ILoadHost):
+                    containers = self._host.get_containers()
+                else:
+                    containers = self._host.ls()
+
+            except BaseException:
+                self.log.error(
+                    "Failed to collect loaded products.", exc_info=True
+                )
+                containers = []
+
             repre_ids = set()
             for container in containers:
                 repre_id = container.get("representation")
diff --git a/client/ayon_core/tools/loader/ui/folders_widget.py b/client/ayon_core/tools/loader/ui/folders_widget.py
index 7b146456da..efd041937d 100644
--- a/client/ayon_core/tools/loader/ui/folders_widget.py
+++ b/client/ayon_core/tools/loader/ui/folders_widget.py
@@ -321,6 +321,8 @@ class LoaderFoldersWidget(QtWidgets.QWidget):
         """
 
         self._folders_proxy_model.setFilterFixedString(name)
+        if name:
+            self._folders_view.expandAll()
 
     def set_merged_products_selection(self, items):
         """
diff --git a/client/ayon_core/tools/utils/folders_widget.py b/client/ayon_core/tools/utils/folders_widget.py
index 2ad640de37..6aae68bf8a 100644
--- a/client/ayon_core/tools/utils/folders_widget.py
+++ b/client/ayon_core/tools/utils/folders_widget.py
@@ -370,6 +370,8 @@ class FoldersWidget(QtWidgets.QWidget):
         """
 
         self._folders_proxy_model.setFilterFixedString(name)
+        if name:
+            self._folders_view.expandAll()
 
     def refresh(self):
         """Refresh folders model.
diff --git a/pyproject.toml b/pyproject.toml
index ca887f2299..2f30778519 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -79,12 +79,12 @@ dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
 
 exclude = [
     "client/ayon_core/hosts/unreal/integration/*",
-    "client/ayon_core/hosts/aftereffects/api/extension/js/libs/*",
     "client/ayon_core/modules/deadline/repository/custom/plugins/CelAction/*",
     "client/ayon_core/modules/deadline/repository/custom/plugins/HarmonyAYON/*",
     "client/ayon_core/modules/click_wrap.py",
     "client/ayon_core/scripts/slates/__init__.py",
-    "server_addon/hiero/client/ayon_hiero/api/startup/*"
+    "server_addon/hiero/client/ayon_hiero/api/startup/*",
+    "server_addon/aftereffects/client/ayon_aftereffects/api/extension/js/libs/*"
 ]
 
 [tool.ruff.lint.per-file-ignores]
diff --git a/client/ayon_core/hosts/aftereffects/__init__.py b/server_addon/aftereffects/client/ayon_aftereffects/__init__.py
similarity index 79%
rename from client/ayon_core/hosts/aftereffects/__init__.py
rename to server_addon/aftereffects/client/ayon_aftereffects/__init__.py
index 02ab287629..e8de12e42e 100644
--- a/client/ayon_core/hosts/aftereffects/__init__.py
+++ b/server_addon/aftereffects/client/ayon_aftereffects/__init__.py
@@ -1,3 +1,4 @@
+from .version import __version__
 from .addon import (
     AFTEREFFECTS_ADDON_ROOT,
     AfterEffectsAddon,
@@ -6,6 +7,8 @@ from .addon import (
 
 
 __all__ = (
+    "__version__",
+
     "AFTEREFFECTS_ADDON_ROOT",
     "AfterEffectsAddon",
     "get_launch_script_path",
diff --git a/client/ayon_core/hosts/aftereffects/addon.py b/server_addon/aftereffects/client/ayon_aftereffects/addon.py
similarity index 94%
rename from client/ayon_core/hosts/aftereffects/addon.py
rename to server_addon/aftereffects/client/ayon_aftereffects/addon.py
index fc54043c1d..f659eba1cb 100644
--- a/client/ayon_core/hosts/aftereffects/addon.py
+++ b/server_addon/aftereffects/client/ayon_aftereffects/addon.py
@@ -2,11 +2,14 @@ import os
 
 from ayon_core.addon import AYONAddon, IHostAddon
 
+from .version import __version__
+
 AFTEREFFECTS_ADDON_ROOT = os.path.dirname(os.path.abspath(__file__))
 
 
 class AfterEffectsAddon(AYONAddon, IHostAddon):
     name = "aftereffects"
+    version = __version__
     host_name = "aftereffects"
 
     def add_implementation_envs(self, env, _app):
diff --git a/client/ayon_core/hosts/aftereffects/api/README.md b/server_addon/aftereffects/client/ayon_aftereffects/api/README.md
similarity index 94%
rename from client/ayon_core/hosts/aftereffects/api/README.md
rename to server_addon/aftereffects/client/ayon_aftereffects/api/README.md
index 53eb896255..ca7d5b9b13 100644
--- a/client/ayon_core/hosts/aftereffects/api/README.md
+++ b/server_addon/aftereffects/client/ayon_aftereffects/api/README.md
@@ -25,7 +25,7 @@ download [Anastasiy’s Extension Manager](https://install.anastasiy.com/)
 The easiest way to get the server and After Effects launch is with:
 
 ```
-python -c ^"import ayon_core.hosts.photoshop;ayon_core.hosts.aftereffects.launch(""c:\Program Files\Adobe\Adobe After Effects 2020\Support Files\AfterFX.exe"")^"
+python -c ^"import ayon_core.hosts.photoshop;ayon_aftereffects.launch(""c:\Program Files\Adobe\Adobe After Effects 2020\Support Files\AfterFX.exe"")^"
 ```
 
 `avalon.aftereffects.launch` launches the application and server, and also closes the server when After Effects exists.
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 96%
rename from client/ayon_core/hosts/aftereffects/api/launch_logic.py
rename to server_addon/aftereffects/client/ayon_aftereffects/api/launch_logic.py
index da6887668a..3a4fd0e719 100644
--- a/client/ayon_core/hosts/aftereffects/api/launch_logic.py
+++ b/server_addon/aftereffects/client/ayon_aftereffects/api/launch_logic.py
@@ -18,8 +18,8 @@ from ayon_core.lib import Logger, is_in_tests
 from ayon_core.pipeline import install_host
 from ayon_core.addon import AddonsManager
 from ayon_core.tools.utils import host_tools, get_ayon_qt_app
-from ayon_core.tools.adobe_webserver.app import WebServerTool
 
+from .webserver import WebServerTool
 from .ws_stub import get_stub
 from .lib import set_settings
 
@@ -35,7 +35,7 @@ def main(*subprocess_args):
     """Main entrypoint to AE launching, called from pre hook."""
     sys.excepthook = safe_excepthook
 
-    from ayon_core.hosts.aftereffects.api import AfterEffectsHost
+    from ayon_aftereffects.api import AfterEffectsHost
 
     host = AfterEffectsHost()
     install_host(host)
@@ -355,7 +355,7 @@ class AfterEffectsRoute(WebSocketRoute):
         return "nothing"
 
     def create_placeholder_route(self):
-        from ayon_core.hosts.aftereffects.api.workfile_template_builder import \
+        from ayon_aftereffects.api.workfile_template_builder import \
             create_placeholder
         partial_method = functools.partial(create_placeholder)
 
@@ -365,7 +365,7 @@ class AfterEffectsRoute(WebSocketRoute):
         return "nothing"
 
     def update_placeholder_route(self):
-        from ayon_core.hosts.aftereffects.api.workfile_template_builder import \
+        from ayon_aftereffects.api.workfile_template_builder import \
             update_placeholder
         partial_method = functools.partial(update_placeholder)
 
@@ -375,7 +375,7 @@ class AfterEffectsRoute(WebSocketRoute):
         return "nothing"
 
     def build_workfile_template_route(self):
-        from ayon_core.hosts.aftereffects.api.workfile_template_builder import \
+        from ayon_aftereffects.api.workfile_template_builder import \
             build_workfile_template
         partial_method = functools.partial(build_workfile_template)
 
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 97%
rename from client/ayon_core/hosts/aftereffects/api/launch_script.py
rename to server_addon/aftereffects/client/ayon_aftereffects/api/launch_script.py
index 87926c022b..6b7f12ca43 100644
--- a/client/ayon_core/hosts/aftereffects/api/launch_script.py
+++ b/server_addon/aftereffects/client/ayon_aftereffects/api/launch_script.py
@@ -8,7 +8,7 @@ workfile or others.
 import os
 import sys
 
-from ayon_core.hosts.aftereffects.api.launch_logic import main as host_main
+from ayon_aftereffects.api.launch_logic import main as host_main
 
 # Get current file to locate start point of sys.argv
 CURRENT_FILE = os.path.abspath(__file__)
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 97%
rename from client/ayon_core/hosts/aftereffects/api/pipeline.py
rename to server_addon/aftereffects/client/ayon_aftereffects/api/pipeline.py
index 2239040f09..4bc51a324b 100644
--- a/client/ayon_core/hosts/aftereffects/api/pipeline.py
+++ b/server_addon/aftereffects/client/ayon_aftereffects/api/pipeline.py
@@ -14,8 +14,6 @@ from ayon_core.pipeline import (
     AYON_INSTANCE_ID,
 )
 from ayon_core.pipeline.load import any_outdated_containers
-import ayon_core.hosts.aftereffects
-
 from ayon_core.host import (
     HostBase,
     IWorkfileHost,
@@ -23,6 +21,7 @@ from ayon_core.host import (
     IPublishHost
 )
 from ayon_core.tools.utils import get_ayon_qt_app
+from ayon_aftereffects import AFTEREFFECTS_ADDON_ROOT
 
 from .launch_logic import get_stub
 from .ws_stub import ConnectionNotEstablishedYet
@@ -30,10 +29,7 @@ from .ws_stub import ConnectionNotEstablishedYet
 log = Logger.get_logger(__name__)
 
 
-HOST_DIR = os.path.dirname(
-    os.path.abspath(ayon_core.hosts.aftereffects.__file__)
-)
-PLUGINS_DIR = os.path.join(HOST_DIR, "plugins")
+PLUGINS_DIR = os.path.join(AFTEREFFECTS_ADDON_ROOT, "plugins")
 PUBLISH_PATH = os.path.join(PLUGINS_DIR, "publish")
 LOAD_PATH = os.path.join(PLUGINS_DIR, "load")
 CREATE_PATH = os.path.join(PLUGINS_DIR, "create")
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/tools/adobe_webserver/app.py b/server_addon/aftereffects/client/ayon_aftereffects/api/webserver.py
similarity index 94%
rename from client/ayon_core/tools/adobe_webserver/app.py
rename to server_addon/aftereffects/client/ayon_aftereffects/api/webserver.py
index 26bf638c91..aaecaa4c05 100644
--- a/client/ayon_core/tools/adobe_webserver/app.py
+++ b/server_addon/aftereffects/client/ayon_aftereffects/api/webserver.py
@@ -1,7 +1,11 @@
-"""This Webserver tool is python 3 specific.
+"""Webserver for communication with AfterEffects.
 
-Don't import directly to avalon.tools or implementation of Python 2 hosts
-would break.
+Aiohttp (Asyncio) based websocket server used for communication with host
+application.
+
+This webserver is started in spawned Python process that opens DCC during
+its launch, waits for connection from DCC and handles communication going
+forward. Server is closed before Python process is killed.
 """
 import os
 import logging
@@ -12,9 +16,7 @@ import socket
 
 from aiohttp import web
 
-from wsrpc_aiohttp import (
-    WSRPCClient
-)
+from wsrpc_aiohttp import WSRPCClient
 
 from ayon_core.pipeline import get_global_context
 
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 99%
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
index 99d5bbb938..77fd1059b5 100644
--- a/client/ayon_core/hosts/aftereffects/api/workfile_template_builder.py
+++ b/server_addon/aftereffects/client/ayon_aftereffects/api/workfile_template_builder.py
@@ -12,7 +12,7 @@ from ayon_core.pipeline.workfile.workfile_template_builder import (
     PlaceholderPlugin,
     PlaceholderItem
 )
-from ayon_core.hosts.aftereffects.api import get_stub
+from ayon_aftereffects.api import get_stub
 
 PLACEHOLDER_SET = "PLACEHOLDERS_SET"
 PLACEHOLDER_ID = "openpype.placeholder"
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 99%
rename from client/ayon_core/hosts/aftereffects/api/ws_stub.py
rename to server_addon/aftereffects/client/ayon_aftereffects/api/ws_stub.py
index 869acc3405..60842e0612 100644
--- a/client/ayon_core/hosts/aftereffects/api/ws_stub.py
+++ b/server_addon/aftereffects/client/ayon_aftereffects/api/ws_stub.py
@@ -8,7 +8,8 @@ import logging
 import attr
 
 from wsrpc_aiohttp import WebSocketAsync
-from ayon_core.tools.adobe_webserver.app import WebServerTool
+
+from .webserver import WebServerTool
 
 
 class ConnectionNotEstablishedYet(Exception):
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 97%
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
index a37481566e..6a8b434953 100644
--- a/client/ayon_core/hosts/aftereffects/hooks/pre_launch_args.py
+++ b/server_addon/aftereffects/client/ayon_aftereffects/hooks/pre_launch_args.py
@@ -7,7 +7,7 @@ from ayon_core.lib import (
     is_using_ayon_console,
 )
 from ayon_applications import PreLaunchHook, LaunchTypes
-from ayon_core.hosts.aftereffects import get_launch_script_path
+from ayon_aftereffects import get_launch_script_path
 
 
 def get_launch_kwargs(kwargs):
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 98%
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
index 29df34876a..eafe845247 100644
--- a/client/ayon_core/hosts/aftereffects/plugins/create/create_render.py
+++ b/server_addon/aftereffects/client/ayon_aftereffects/plugins/create/create_render.py
@@ -2,16 +2,16 @@ import re
 
 from ayon_core import resources
 from ayon_core.lib import BoolDef, UISeparatorDef
-from ayon_core.hosts.aftereffects import api
 from ayon_core.pipeline import (
     Creator,
     CreatedInstance,
     CreatorError
 )
-from ayon_core.hosts.aftereffects.api.pipeline import cache_and_get_instances
-from ayon_core.hosts.aftereffects.api.lib import set_settings
 from ayon_core.lib import prepare_template_data
 from ayon_core.pipeline.create import PRODUCT_NAME_ALLOWED_SYMBOLS
+from ayon_aftereffects import api
+from ayon_aftereffects.api.pipeline import cache_and_get_instances
+from ayon_aftereffects.api.lib import set_settings
 
 
 class RenderCreator(Creator):
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 96%
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
index b46e82bf1a..fcf25a3944 100644
--- a/client/ayon_core/hosts/aftereffects/plugins/create/workfile_creator.py
+++ b/server_addon/aftereffects/client/ayon_aftereffects/plugins/create/workfile_creator.py
@@ -1,11 +1,11 @@
 import ayon_api
 
-import ayon_core.hosts.aftereffects.api as api
 from ayon_core.pipeline import (
     AutoCreator,
     CreatedInstance
 )
-from ayon_core.hosts.aftereffects.api.pipeline import cache_and_get_instances
+from ayon_aftereffects import api
+from ayon_aftereffects.api.pipeline import cache_and_get_instances
 
 
 class AEWorkfileCreator(AutoCreator):
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 97%
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
index 5685011d5f..62a4e24482 100644
--- a/client/ayon_core/hosts/aftereffects/plugins/load/load_background.py
+++ b/server_addon/aftereffects/client/ayon_aftereffects/plugins/load/load_background.py
@@ -1,9 +1,9 @@
 import re
 
 from ayon_core.pipeline import get_representation_path
-from ayon_core.hosts.aftereffects import api
 
-from ayon_core.hosts.aftereffects.api.lib import (
+from ayon_aftereffects import api
+from ayon_aftereffects.api.lib import (
     get_background_layers,
     get_unique_layer_name,
 )
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 96%
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
index 4b81201722..05749885c9 100644
--- a/client/ayon_core/hosts/aftereffects/plugins/load/load_file.py
+++ b/server_addon/aftereffects/client/ayon_aftereffects/plugins/load/load_file.py
@@ -1,8 +1,8 @@
 import re
 
 from ayon_core.pipeline import get_representation_path
-from ayon_core.hosts.aftereffects import api
-from ayon_core.hosts.aftereffects.api.lib import get_unique_layer_name
+from ayon_aftereffects import api
+from ayon_aftereffects.api.lib import get_unique_layer_name
 
 
 class FileLoader(api.AfterEffectsLoader):
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 90%
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
index 331d5281ed..b8a36bce44 100644
--- 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
@@ -1,6 +1,6 @@
 import pyblish.api
 
-from ayon_core.hosts.aftereffects.api import get_stub
+from ayon_aftereffects.api import get_stub
 
 
 class AddPublishHighlight(pyblish.api.InstancePlugin):
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 91%
rename from client/ayon_core/hosts/aftereffects/plugins/publish/closeAE.py
rename to server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/closeAE.py
index c00591729e..3aa0a01854 100644
--- a/client/ayon_core/hosts/aftereffects/plugins/publish/closeAE.py
+++ b/server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/closeAE.py
@@ -2,7 +2,7 @@
 """Close AE after publish. For Webpublishing only."""
 import pyblish.api
 
-from ayon_core.hosts.aftereffects.api import get_stub
+from ayon_aftereffects.api import get_stub
 
 
 class CloseAE(pyblish.api.ContextPlugin):
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 94%
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
index c0ef0b71a4..3f7108186c 100644
--- a/client/ayon_core/hosts/aftereffects/plugins/publish/collect_audio.py
+++ b/server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/collect_audio.py
@@ -2,7 +2,7 @@ import os
 
 import pyblish.api
 
-from ayon_core.hosts.aftereffects.api import get_stub
+from ayon_aftereffects.api import get_stub
 
 
 class CollectAudio(pyblish.api.ContextPlugin):
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 88%
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
index aead872461..6a247d5234 100644
--- 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
@@ -2,7 +2,7 @@ import os
 
 import pyblish.api
 
-from ayon_core.hosts.aftereffects.api import get_stub
+from ayon_aftereffects.api import get_stub
 
 
 class CollectCurrentFile(pyblish.api.ContextPlugin):
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 97%
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
index 5b8393a49a..968943abc4 100644
--- 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
@@ -2,7 +2,7 @@ import os
 import re
 import pyblish.api
 
-from ayon_core.hosts.aftereffects.api import (
+from ayon_aftereffects.api import (
     get_stub,
     get_extension_manifest_path
 )
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 99%
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
index ebd4b8f944..3508512cba 100644
--- a/client/ayon_core/hosts/aftereffects/plugins/publish/collect_render.py
+++ b/server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/collect_render.py
@@ -6,8 +6,8 @@ import pyblish.api
 
 from ayon_core.pipeline import publish
 from ayon_core.pipeline.publish import RenderInstance
-from ayon_core.hosts.aftereffects.api import get_stub
 
+from ayon_aftereffects.api import get_stub
 
 @attr.s
 class AERenderInstance(RenderInstance):
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 94%
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
index 667e9cf8b9..8074342cc8 100644
--- a/client/ayon_core/hosts/aftereffects/plugins/publish/collect_review.py
+++ b/server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/collect_review.py
@@ -14,6 +14,7 @@ class CollectReview(pyblish.api.ContextPlugin):
     label = "Collect Review"
     hosts = ["aftereffects"]
     order = pyblish.api.CollectorOrder + 0.1
+    settings_category = "aftereffects"
 
     def process(self, context):
         for instance in context:
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 97%
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
index c5e62a2f54..9f152414e5 100644
--- 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
@@ -1,8 +1,8 @@
 import os
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.aftereffects.api import get_stub
 
+from ayon_aftereffects.api import get_stub
 
 class ExtractLocalRender(publish.Extractor):
     """Render RenderQueue locally."""
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 86%
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
index f0007f96d9..165d1d081a 100644
--- 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
@@ -1,7 +1,7 @@
 import pyblish.api
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.aftereffects.api import get_stub
+from ayon_aftereffects.api import get_stub
 
 
 class ExtractSaveScene(pyblish.api.ContextPlugin):
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 94%
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
index fc51ff9176..9c1f79c477 100644
--- a/client/ayon_core/hosts/aftereffects/plugins/publish/increment_workfile.py
+++ b/server_addon/aftereffects/client/ayon_aftereffects/plugins/publish/increment_workfile.py
@@ -2,7 +2,7 @@ import pyblish.api
 from ayon_core.lib import version_up
 from ayon_core.pipeline.publish import get_errored_plugins_from_context
 
-from ayon_core.hosts.aftereffects.api import get_stub
+from ayon_aftereffects.api import get_stub
 
 
 class IncrementWorkfile(pyblish.api.InstancePlugin):
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 93%
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
index 70b6efecb0..3367fa4e94 100644
--- 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
@@ -1,5 +1,5 @@
 from ayon_core.pipeline import publish
-from ayon_core.hosts.aftereffects.api import get_stub
+from ayon_aftereffects.api import get_stub
 
 
 class RemovePublishHighlight(publish.Extractor):
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 96%
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
index ae20102417..1f23b1ef7c 100644
--- 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
@@ -9,7 +9,7 @@ import pyblish.api
 from ayon_core.pipeline import (
     PublishXmlValidationError
 )
-from ayon_core.hosts.aftereffects.api import get_stub
+from ayon_aftereffects.api import get_stub
 
 
 class ValidateFootageItems(pyblish.api.InstancePlugin):
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 97%
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
index c4411bd4c2..01d046938b 100644
--- 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
@@ -5,7 +5,7 @@ from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
     PublishXmlValidationError,
 )
-from ayon_core.hosts.aftereffects.api import get_stub
+from ayon_aftereffects.api import get_stub
 
 
 class ValidateInstanceFolderRepair(pyblish.api.Action):
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 98%
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
index 6375f5cc61..97fdee11ff 100644
--- 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
@@ -13,7 +13,7 @@ from ayon_core.pipeline import (
     PublishXmlValidationError,
     OptionalPyblishPluginMixin
 )
-from ayon_core.hosts.aftereffects.api import get_folder_settings
+from ayon_aftereffects.api import get_folder_settings
 
 
 class ValidateSceneSettings(OptionalPyblishPluginMixin,
@@ -60,6 +60,7 @@ class ValidateSceneSettings(OptionalPyblishPluginMixin,
     label = "Validate Scene Settings"
     families = ["render.farm", "render.local", "render"]
     hosts = ["aftereffects"]
+    settings_category = "aftereffects"
     optional = True
 
     skip_timelines_check = [".*"]  # * >> skip for all
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 89%
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
index c7927f176f..79b820b01a 100644
--- 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
@@ -2,9 +2,11 @@ from ayon_core.pipeline.workfile.workfile_template_builder import (
     CreatePlaceholderItem,
     PlaceholderCreateMixin
 )
-from ayon_core.hosts.aftereffects.api import get_stub
-from ayon_core.hosts.aftereffects.api.lib import set_settings
-import ayon_core.hosts.aftereffects.api.workfile_template_builder as wtb
+from ayon_aftereffects.api import (
+    get_stub,
+    workfile_template_builder as wtb,
+)
+from ayon_aftereffects.api.lib import set_settings
 
 
 class AEPlaceholderCreatePlugin(wtb.AEPlaceholderPlugin,
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 94%
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
index 7f7e4f49ce..e4f021e5ff 100644
--- 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
@@ -2,8 +2,10 @@ from ayon_core.pipeline.workfile.workfile_template_builder import (
     LoadPlaceholderItem,
     PlaceholderLoadMixin
 )
-from ayon_core.hosts.aftereffects.api import get_stub
-import ayon_core.hosts.aftereffects.api.workfile_template_builder as wtb
+from ayon_aftereffects.api import (
+    get_stub,
+    workfile_template_builder as wtb,
+)
 
 
 class AEPlaceholderLoadPlugin(wtb.AEPlaceholderPlugin, PlaceholderLoadMixin):
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
diff --git a/server_addon/aftereffects/client/ayon_aftereffects/version.py b/server_addon/aftereffects/client/ayon_aftereffects/version.py
new file mode 100644
index 0000000000..8ab87ea78c
--- /dev/null
+++ b/server_addon/aftereffects/client/ayon_aftereffects/version.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+"""Package declaring AYON addon 'aftereffects' version."""
+__version__ = "0.2.0"
diff --git a/server_addon/aftereffects/client/pyproject.toml b/server_addon/aftereffects/client/pyproject.toml
new file mode 100644
index 0000000000..dcfaab09e6
--- /dev/null
+++ b/server_addon/aftereffects/client/pyproject.toml
@@ -0,0 +1,6 @@
+[project]
+name="aftereffects"
+description="AYON AfterEffects addon."
+
+[ayon.runtimeDependencies]
+wsrpc_aiohttp = "^3.1.1" # websocket server
diff --git a/server_addon/aftereffects/package.py b/server_addon/aftereffects/package.py
index 7a2f9bc7af..8e4e70fc3b 100644
--- a/server_addon/aftereffects/package.py
+++ b/server_addon/aftereffects/package.py
@@ -1,3 +1,10 @@
 name = "aftereffects"
 title = "AfterEffects"
-version = "0.1.4"
+version = "0.2.0"
+
+client_dir = "ayon_aftereffects"
+
+ayon_required_addons = {
+    "core": ">0.3.2",
+}
+ayon_compatible_addons = {}
diff --git a/server_addon/create_ayon_addons.py b/server_addon/create_ayon_addons.py
index 749077d2a8..ac053c8e09 100644
--- a/server_addon/create_ayon_addons.py
+++ b/server_addon/create_ayon_addons.py
@@ -1,3 +1,4 @@
+import io
 import os
 import sys
 import re
@@ -9,7 +10,7 @@ import importlib.machinery
 import platform
 import collections
 from pathlib import Path
-from typing import Any, Optional, Iterable, Pattern, List, Tuple
+from typing import Optional, Iterable, Pattern, List, Tuple
 
 # Patterns of directories to be skipped for server part of addon
 IGNORE_DIR_PATTERNS: List[Pattern] = [
@@ -70,9 +71,7 @@ class ZipFileLongPaths(zipfile.ZipFile):
             else:
                 tpath = "\\\\?\\" + tpath
 
-        return super(ZipFileLongPaths, self)._extract_member(
-            member, tpath, pwd
-        )
+        return super()._extract_member(member, tpath, pwd)
 
 
 def _value_match_regexes(value: str, regexes: Iterable[Pattern]) -> bool:
@@ -86,7 +85,7 @@ def find_files_in_subdir(
     src_path: str,
     ignore_file_patterns: Optional[List[Pattern]] = None,
     ignore_dir_patterns: Optional[List[Pattern]] = None,
-    ignore_subdirs: Optional[Iterable[Tuple[str]]] = None
+    include_empty_dirs: bool = True
 ):
     """Find all files to copy in subdirectories of given path.
 
@@ -100,8 +99,7 @@ def find_files_in_subdir(
             to match files to ignore.
         ignore_dir_patterns (Optional[List[Pattern]]): List of regexes
             to match directories to ignore.
-        ignore_subdirs (Optional[Iterable[Tuple[str]]]): List of
-            subdirectories to ignore.
+        include_empty_dirs (Optional[bool]): Do not skip empty directories.
 
     Returns:
         List[Tuple[str, str]]: List of tuples with path to file and parent
@@ -113,16 +111,18 @@ def find_files_in_subdir(
 
     if ignore_dir_patterns is None:
         ignore_dir_patterns = IGNORE_DIR_PATTERNS
-    output: list[tuple[str, str]] = []
+    output: List[Tuple[str, str]] = []
 
     hierarchy_queue = collections.deque()
     hierarchy_queue.append((src_path, []))
     while hierarchy_queue:
-        item: tuple[str, str] = hierarchy_queue.popleft()
+        item: Tuple[str, List[str]] = hierarchy_queue.popleft()
         dirpath, parents = item
-        if ignore_subdirs and parents in ignore_subdirs:
-            continue
-        for name in os.listdir(dirpath):
+        subnames = list(os.listdir(dirpath))
+        if not subnames and include_empty_dirs:
+            output.append((dirpath, os.path.sep.join(parents)))
+
+        for name in subnames:
             path = os.path.join(dirpath, name)
             if os.path.isfile(path):
                 if not _value_match_regexes(name, ignore_file_patterns):
@@ -139,89 +139,54 @@ def find_files_in_subdir(
     return output
 
 
-def read_addon_version(version_path: Path) -> str:
-    # Read version
-    version_content: dict[str, Any] = {}
-    with open(str(version_path), "r") as stream:
-        exec(stream.read(), version_content)
-    return version_content["__version__"]
-
-
-def get_addon_version(addon_dir: Path) -> str:
-    return read_addon_version(addon_dir / "server" / "version.py")
-
-
 def create_addon_zip(
     output_dir: Path,
     addon_name: str,
     addon_version: str,
-    keep_source: bool,
+    files_mapping: List[Tuple[str, str]],
+    client_zip_content: io.BytesIO
 ):
     zip_filepath = output_dir / f"{addon_name}-{addon_version}.zip"
 
-    addon_output_dir = output_dir / addon_name / addon_version
     with ZipFileLongPaths(zip_filepath, "w", zipfile.ZIP_DEFLATED) as zipf:
-        # Add client code content to zip
-        src_root = os.path.normpath(str(addon_output_dir.absolute()))
-        src_root_offset = len(src_root) + 1
-        for root, _, filenames in os.walk(str(addon_output_dir)):
-            rel_root = ""
-            if root != src_root:
-                rel_root = root[src_root_offset:]
+        for src_path, dst_subpath in files_mapping:
+            zipf.write(src_path, dst_subpath)
 
-            for filename in filenames:
-                src_path = os.path.join(root, filename)
-                if rel_root:
-                    dst_path = os.path.join(rel_root, filename)
-                else:
-                    dst_path = filename
-
-                zipf.write(src_path, dst_path)
-
-    if not keep_source:
-        shutil.rmtree(str(output_dir / addon_name))
+        if client_zip_content is not None:
+            zipf.writestr("private/client.zip", client_zip_content.getvalue())
 
 
-def prepare_client_code(
-    addon_name: str,
+def prepare_client_zip(
     addon_dir: Path,
-    addon_output_dir: Path,
-    addon_version: str
+    addon_name: str,
+    addon_version: str,
+    client_dir: str
 ):
-    client_dir = addon_dir / "client"
-    if not client_dir.exists():
-        return
+    if not client_dir:
+        return None
+    client_dir_obj = addon_dir / "client" / client_dir
+    if not client_dir_obj.exists():
+        return None
 
-    # Prepare private dir in output
-    private_dir = addon_output_dir / "private"
-    private_dir.mkdir(parents=True, exist_ok=True)
+    # Update version.py with server version if 'version.py' is available
+    version_path = client_dir_obj / "version.py"
+    if version_path.exists():
+        with open(version_path, "w") as stream:
+            stream.write(
+                CLIENT_VERSION_CONTENT.format(addon_name, addon_version)
+            )
 
-    # Copy pyproject toml if available
-    pyproject_toml = client_dir / "pyproject.toml"
-    if pyproject_toml.exists():
-        shutil.copy(pyproject_toml, private_dir)
+    zip_content = io.BytesIO()
+    with ZipFileLongPaths(zip_content, "a", zipfile.ZIP_DEFLATED) as zipf:
+        # Add client code content to zip
+        for path, sub_path in find_files_in_subdir(
+            str(client_dir_obj), include_empty_dirs=False
+        ):
+            sub_path = os.path.join(client_dir, sub_path)
+            zipf.write(path, sub_path)
 
-    for subpath in client_dir.iterdir():
-        if subpath.name == "pyproject.toml":
-            continue
-
-        if subpath.is_file():
-            continue
-
-        # Update version.py with server version if 'version.py' is available
-        version_path = subpath / "version.py"
-        if version_path.exists():
-            with open(version_path, "w") as stream:
-                stream.write(
-                    CLIENT_VERSION_CONTENT.format(addon_name, addon_version)
-                )
-
-        zip_filepath = private_dir / "client.zip"
-        with ZipFileLongPaths(zip_filepath, "w", zipfile.ZIP_DEFLATED) as zipf:
-            # Add client code content to zip
-            for path, sub_path in find_files_in_subdir(str(subpath)):
-                sub_path = os.path.join(subpath.name, sub_path)
-                zipf.write(path, sub_path)
+    zip_content.seek(0)
+    return zip_content
 
 
 def import_filepath(path: Path, module_name: Optional[str] = None):
@@ -241,44 +206,73 @@ def import_filepath(path: Path, module_name: Optional[str] = None):
     return module
 
 
+def _get_server_mapping(
+    addon_dir: Path, addon_version: str
+) -> List[Tuple[str, str]]:
+    server_dir = addon_dir / "server"
+    src_package_py = addon_dir / "package.py"
+    pyproject_toml = addon_dir / "client" / "pyproject.toml"
+
+    mapping: List[Tuple[str, str]] = [
+        (src_path, f"server/{sub_path}")
+        for src_path, sub_path in find_files_in_subdir(str(server_dir))
+    ]
+    mapping.append((src_package_py.as_posix(), "package.py"))
+    if pyproject_toml.exists():
+        mapping.append((pyproject_toml.as_posix(), "private/pyproject.toml"))
+
+    return mapping
+
+
 def create_addon_package(
     addon_dir: Path,
     output_dir: Path,
     create_zip: bool,
-    keep_source: bool,
 ):
     src_package_py = addon_dir / "package.py"
+
     package = import_filepath(src_package_py)
+    addon_name = package.name
     addon_version = package.version
 
-    addon_output_dir = output_dir / addon_dir.name / addon_version
-    if addon_output_dir.exists():
-        shutil.rmtree(str(addon_output_dir))
-    addon_output_dir.mkdir(parents=True)
+    files_mapping = _get_server_mapping(addon_dir, addon_version)
 
-    # Copy server content
-    dst_package_py = addon_output_dir / "package.py"
-    shutil.copy(src_package_py, dst_package_py)
-
-    server_dir = addon_dir / "server"
-    shutil.copytree(
-        server_dir, addon_output_dir / "server", dirs_exist_ok=True
-    )
-
-    prepare_client_code(
-        package.name, addon_dir, addon_output_dir, addon_version
+    client_dir = getattr(package, "client_dir", None)
+    client_zip_content = prepare_client_zip(
+        addon_dir, addon_name, addon_version, client_dir
     )
 
     if create_zip:
         create_addon_zip(
-            output_dir, addon_dir.name, addon_version, keep_source
+            output_dir,
+            addon_name,
+            addon_version,
+            files_mapping,
+            client_zip_content
         )
 
+    else:
+        addon_output_dir = output_dir / addon_dir.name / addon_version
+        if addon_output_dir.exists():
+            shutil.rmtree(str(addon_output_dir))
+
+        addon_output_dir.mkdir(parents=True, exist_ok=True)
+
+        for src_path, dst_subpath in files_mapping:
+            dst_path = addon_output_dir / dst_subpath
+            dst_path.parent.mkdir(parents=True, exist_ok=True)
+            shutil.copy2(src_path, dst_path)
+
+        if client_zip_content is not None:
+            private_dir = addon_output_dir / "private"
+            private_dir.mkdir(parents=True, exist_ok=True)
+            with open(private_dir / "client.zip", "wb") as stream:
+                stream.write(client_zip_content.read())
+
 
 def main(
     output_dir=None,
     skip_zip=True,
-    keep_source=False,
     clear_output_dir=False,
     addons=None,
 ):
@@ -313,9 +307,7 @@ def main(
         if not server_dir.exists():
             continue
 
-        create_addon_package(
-            addon_dir, output_dir, create_zip, keep_source
-        )
+        create_addon_package(addon_dir, output_dir, create_zip)
 
         print(f"- package '{addon_dir.name}' created")
     print(f"Package creation finished. Output directory: {output_dir}")
@@ -366,10 +358,12 @@ if __name__ == "__main__":
     )
 
     args = parser.parse_args(sys.argv[1:])
+    if args.keep_sources:
+        print("Keeping sources is not supported anymore!")
+
     main(
         args.output_dir,
         args.skip_zip,
-        args.keep_sources,
         args.clear_output_dir,
         args.addons,
     )
diff --git a/server_addon/houdini/client/ayon_houdini/version.py b/server_addon/houdini/client/ayon_houdini/version.py
index a30c770e1d..1b06708904 100644
--- a/server_addon/houdini/client/ayon_houdini/version.py
+++ b/server_addon/houdini/client/ayon_houdini/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
-"""Package declaring Houdini addon version."""
+"""Package declaring AYON addon 'houdini' version."""
 __version__ = "0.3.0"