diff --git a/common/openpype_common/distribution/addon_distribution.py b/common/openpype_common/distribution/addon_distribution.py
index fec8cb762b..5e48639dec 100644
--- a/common/openpype_common/distribution/addon_distribution.py
+++ b/common/openpype_common/distribution/addon_distribution.py
@@ -8,12 +8,7 @@ import platform
 import shutil
 
 from .file_handler import RemoteFileHandler
-
-
-class UrlType(Enum):
-    HTTP = "http"
-    GIT = "git"
-    FILESYSTEM = "filesystem"
+from .addon_info import AddonInfo
 
 
 class UpdateState(Enum):
@@ -22,77 +17,6 @@ class UpdateState(Enum):
     FAILED = "failed"
 
 
-@attr.s
-class MultiPlatformPath(object):
-    windows = attr.ib(default=None)
-    linux = attr.ib(default=None)
-    darwin = attr.ib(default=None)
-
-
-@attr.s
-class AddonSource(object):
-    type = attr.ib()
-
-
-@attr.s
-class LocalAddonSource(AddonSource):
-    path = attr.ib(default=attr.Factory(MultiPlatformPath))
-
-
-@attr.s
-class WebAddonSource(AddonSource):
-    url = attr.ib(default=None)
-
-
-@attr.s
-class VersionData(object):
-    version_data = attr.ib(default=None)
-
-
-@attr.s
-class AddonInfo(object):
-    """Object matching json payload from Server"""
-    name = attr.ib()
-    version = attr.ib()
-    title = attr.ib(default=None)
-    sources = attr.ib(default=attr.Factory(dict))
-    hash = attr.ib(default=None)
-    description = attr.ib(default=None)
-    license = attr.ib(default=None)
-    authors = attr.ib(default=None)
-
-    @classmethod
-    def from_dict(cls, data):
-        sources = []
-
-        production_version = data.get("productionVersion")
-        if not production_version:
-            return
-
-        # server payload contains info about all versions
-        # active addon must have 'productionVersion' and matching version info
-        version_data = data.get("versions", {})[production_version]
-
-        for source in version_data.get("clientSourceInfo", []):
-            if source.get("type") == UrlType.FILESYSTEM.value:
-                source_addon = LocalAddonSource(type=source["type"],
-                                                path=source["path"])
-            if source.get("type") == UrlType.HTTP.value:
-                source_addon = WebAddonSource(type=source["type"],
-                                              url=source["url"])
-
-            sources.append(source_addon)
-
-        return cls(name=data.get("name"),
-                   version=production_version,
-                   sources=sources,
-                   hash=data.get("hash"),
-                   description=data.get("description"),
-                   title=data.get("title"),
-                   license=data.get("license"),
-                   authors=data.get("authors"))
-
-
 class AddonDownloader:
     log = logging.getLogger(__name__)
 
diff --git a/common/openpype_common/distribution/addon_info.py b/common/openpype_common/distribution/addon_info.py
new file mode 100644
index 0000000000..00ece11f3b
--- /dev/null
+++ b/common/openpype_common/distribution/addon_info.py
@@ -0,0 +1,80 @@
+import attr
+from enum import Enum
+
+
+class UrlType(Enum):
+    HTTP = "http"
+    GIT = "git"
+    FILESYSTEM = "filesystem"
+
+
+@attr.s
+class MultiPlatformPath(object):
+    windows = attr.ib(default=None)
+    linux = attr.ib(default=None)
+    darwin = attr.ib(default=None)
+
+
+@attr.s
+class AddonSource(object):
+    type = attr.ib()
+
+
+@attr.s
+class LocalAddonSource(AddonSource):
+    path = attr.ib(default=attr.Factory(MultiPlatformPath))
+
+
+@attr.s
+class WebAddonSource(AddonSource):
+    url = attr.ib(default=None)
+
+
+@attr.s
+class VersionData(object):
+    version_data = attr.ib(default=None)
+
+
+@attr.s
+class AddonInfo(object):
+    """Object matching json payload from Server"""
+    name = attr.ib()
+    version = attr.ib()
+    title = attr.ib(default=None)
+    sources = attr.ib(default=attr.Factory(dict))
+    hash = attr.ib(default=None)
+    description = attr.ib(default=None)
+    license = attr.ib(default=None)
+    authors = attr.ib(default=None)
+
+    @classmethod
+    def from_dict(cls, data):
+        sources = []
+
+        production_version = data.get("productionVersion")
+        if not production_version:
+            return
+
+        # server payload contains info about all versions
+        # active addon must have 'productionVersion' and matching version info
+        version_data = data.get("versions", {})[production_version]
+
+        for source in version_data.get("clientSourceInfo", []):
+            if source.get("type") == UrlType.FILESYSTEM.value:
+                source_addon = LocalAddonSource(type=source["type"],
+                                                path=source["path"])
+            if source.get("type") == UrlType.HTTP.value:
+                source_addon = WebAddonSource(type=source["type"],
+                                              url=source["url"])
+
+            sources.append(source_addon)
+
+        return cls(name=data.get("name"),
+                   version=production_version,
+                   sources=sources,
+                   hash=data.get("hash"),
+                   description=data.get("description"),
+                   title=data.get("title"),
+                   license=data.get("license"),
+                   authors=data.get("authors"))
+
diff --git a/common/openpype_common/distribution/tests/test_addon_distributtion.py b/common/openpype_common/distribution/tests/test_addon_distributtion.py
index 46bcd276cd..765ea0596a 100644
--- a/common/openpype_common/distribution/tests/test_addon_distributtion.py
+++ b/common/openpype_common/distribution/tests/test_addon_distributtion.py
@@ -4,13 +4,13 @@ import tempfile
 
 from common.openpype_common.distribution.addon_distribution import (
     AddonDownloader,
-    UrlType,
     OSAddonDownloader,
     HTTPAddonDownloader,
     AddonInfo,
     update_addon_state,
     UpdateState
 )
+from common.openpype_common.distribution.addon_info import UrlType
 
 
 @pytest.fixture