diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dc4e306..0f0b368 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          lfs: true
+          submodules: recursive
 
       - uses: actions/cache@v4
         with:
@@ -26,8 +26,4 @@ jobs:
           UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
         with:
           githubToken: ${{ secrets.GITHUB_TOKEN }}
-          packageMode: true
-          projectPath: Packages/com.trytalo.talo
           unityVersion: 6000.0.28f1
-          scopedRegistryUrl: https://package.openupm.com
-          registryScopes: 'com.mikeschweitzer.websocket'
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index 650ad6d..7bd8fd4 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -7,57 +7,26 @@ jobs:
   release:
     runs-on: ubuntu-latest
 
-    env:
-      COMMIT_EMAIL: 7089284+tudddorrr@users.noreply.github.com
-      COMMIT_MESSAGE: "Release https://github.com/TaloDev/unity/releases/tag/${{ github.ref_name }}"
-
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: recursive
 
       - uses: actions/setup-node@v4
         with:
           node-version: 20
 
-      - name: Copy files
-        run: |
-          mkdir -p Release/Samples~
-          cp -a Packages/com.trytalo.talo/. Release
-          cp -a Assets/Samples/. Release/Samples~
-
-      - name: Copy to package repo (main branch)
-        uses: tudddorrr/github-action-push-to-another-repository@main
-        if: "!contains(github.event.head_commit.message, '--no-release') && !contains(github.event.head_commit.message, 'pre.')"
-        env:
-          SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
-        with:
-          source-directory: Release
-          destination-github-username: TaloDev
-          destination-repository-name: unity-package
-          user-email: ${{ env.COMMIT_EMAIL }}
-          commit-message: ${{ env.COMMIT_MESSAGE }}
-
-      - name: Copy to package repo (version branch)
-        uses: tudddorrr/github-action-push-to-another-repository@main
-        env:
-          SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
+      - name: Install Unity
+        uses: game-ci/unity-builder@v3
         with:
-          source-directory: Release
-          destination-github-username: TaloDev
-          destination-repository-name: unity-package
-          user-email: ${{ env.COMMIT_EMAIL }}
-          commit-message: ${{ env.COMMIT_MESSAGE }}
-          target-branch: ${{ github.ref_name }}
-
-      - name: Create artifact
-        run: |
-          cd Release
-          npm pack
+          unityVersion: 6000.0.28f1
 
-      - name: Remove the version from the artifact name
+      - name: Create Unity Package
         run: |
-          filepath=$(ls Release/*.tgz)
-          new_filepath=$(echo "$filepath" | sed -E 's/-[0-9]+\.[0-9]+\.[0-9]+\.tgz$/.tgz/')
-          mv "$filepath" "$new_filepath"
+          mkdir -p Release
+          unity-editor -batchmode -nographics -quit \
+            -projectPath "$(pwd)" \
+            -exportPackage "Assets/Talo Game Services" "Release/talo.unitypackage"
 
       - name: Upload to itch
         uses: manleydev/butler-publish-itchio-action@master
@@ -66,7 +35,7 @@ jobs:
           CHANNEL: package
           ITCH_GAME: talo-unity
           ITCH_USER: sleepystudios
-          PACKAGE: Release/com.trytalo.talo.tgz
+          PACKAGE: Release/talo.unitypackage
           VERSION: ${{ github.ref_name }}
 
       - name: Create release
@@ -75,4 +44,4 @@ jobs:
         with:
           generate_release_notes: true
           prerelease: ${{ contains(github.event.head_commit.message, 'pre.') }}
-          files: Release/*.tgz
+          files: Release/talo.unitypackage
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..ed9df38
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "Assets/Talo Game Services/Talo/Runtime/Vendor/com.mikeschweitzer.websocket"]
+	path = Assets/Talo Game Services/Talo/Runtime/Vendor/com.mikeschweitzer.websocket
+	url = https://github.com/mikerochip/unity-websocket.git
diff --git a/Assets/Samples/ChatDemo/Scripts/ChatUIController.cs b/Assets/Samples/ChatDemo/Scripts/ChatUIController.cs
deleted file mode 100644
index d29483b..0000000
--- a/Assets/Samples/ChatDemo/Scripts/ChatUIController.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-using UnityEngine;
-using TaloGameServices;
-using UnityEngine.UIElements;
-using System.Collections.Generic;
-
-public class ChatUIController : MonoBehaviour
-{
-    public string playerUsername;
-    private int activeChannelId;
-
-    private List<string> messages = new List<string>();
-    private VisualElement root;
-    private ListView messagesList;
-    private VisualElement channelsList;
-    private TextField messageField;
-    private Button sendButton;
-    private TextField channelNameField;
-    private Button createButton;
-
-    private async void Start()
-    {
-        root = GetComponent<UIDocument>().rootVisualElement;
-
-        InitMessagesList();
-        messageField = root.Q<TextField>("message");
-        sendButton = root.Q<Button>("post-btn");
-        sendButton.clicked += OnSendClick;
-
-        Talo.Channels.OnMessageReceived += OnMessageReceived;
-        Talo.PlayerPresence.OnPresenceChanged += OnPresenceChanged;
-
-        if (string.IsNullOrEmpty(playerUsername))
-        {
-            AddMessage("[SYSTEM] No player username set, please set one in the UI game object");
-            return;
-        }
-
-        await Talo.Players.Identify("username", playerUsername);
-        AddMessage("[SYSTEM] Identified as " + playerUsername);
-
-        InitChannelsList();
-
-        channelNameField = root.Q<TextField>("channel-name");
-        createButton = root.Q<Button>("create-btn");
-        createButton.clicked += OnCreateChannelClick;
-    }
-
-    private void InitMessagesList()
-    {
-        messagesList = root.Q<ListView>("list");
-
-        messagesList.makeItem = () =>
-        {
-            var label = new Label();
-            label.style.color = new StyleColor(Color.white);
-            label.style.fontSize = 22;
-
-            return label;
-        };
-
-        messagesList.bindItem = (e, i) =>
-        {
-            e.Q<Label>().text = messages[i];
-        };
-
-        messagesList.itemsSource = messages;
-    }
-
-    private void AddChannelToList(Channel channel)
-    {
-        var button = new Button();
-        button.text = channel.name;
-        button.style.fontSize = 16;
-        button.style.height = 20;
-        button.clicked += async () => {
-            await Talo.Channels.Join(channel.id);
-            activeChannelId = channel.id;
-            AddMessage("[SYSTEM] Switched to channel " + channel.name);
-        };
-        channelsList.Add(button);
-    }
-
-    private async void InitChannelsList()
-    {
-        var res = await Talo.Channels.GetChannels(0);
-
-        channelsList = root.Q<VisualElement>("channels");
-        foreach (var channel in res.channels)
-        {
-            AddChannelToList(channel);
-        }
-    }
-
-    private void OnSendClick()
-    {
-        if (Talo.CurrentPlayer == null)
-        {
-            AddMessage("[SYSTEM] No player username set, please set one in the UI game object");
-            return;
-        }
-
-        if (activeChannelId < 1)
-        {
-            AddMessage("[SYSTEM] No active channel set, please join a channel");
-            return;
-        }
-
-        var message = messageField.text;
-        if (string.IsNullOrEmpty(message))
-        {
-            AddMessage("[SYSTEM] Message cannot be empty");
-            return;
-        }
-
-        Talo.Channels.SendMessage(activeChannelId, message);
-        messageField.value = "";
-    }
-
-    private async void OnCreateChannelClick()
-    {
-        if (Talo.CurrentPlayer == null)
-        {
-            AddMessage("[SYSTEM] No player username set, please set one in the UI game object");
-            return;
-        }
-
-        var channelName = channelNameField.text;
-        if (string.IsNullOrEmpty(channelName))
-        {
-            AddMessage("[SYSTEM] Channel name cannot be empty");
-            return;
-        }
-
-        var channel = await Talo.Channels.Create(channelName);
-        AddChannelToList(channel);
-        channelNameField.value = "";
-        activeChannelId = channel.id;
-
-        AddMessage("[SYSTEM] Created and joined channel " + channel.name);
-    }
-
-    private void AddMessage(string message)
-    {
-        messages.Add(message);
-        messagesList.Rebuild();
-    }
-
-    private void OnMessageReceived(Channel channel, PlayerAlias playerAlias, string message)
-    {
-        if (channel.id == activeChannelId)
-        {
-            AddMessage($"[{channel.name}] {playerAlias.identifier}: {message}");
-        }
-    }
-
-    private void OnPresenceChanged(PlayerPresence presence, bool onlineChanged, bool customStatusChanged)
-    {
-        if (onlineChanged)
-        {
-            AddMessage($"[SYSTEM] {presence.playerAlias.identifier} is now {(presence.online ? "online" : "offline")}");
-        }
-    }
-}
diff --git a/Assets/Samples/LeaderboardsDemo/Scripts/LeaderboardUIController.cs b/Assets/Samples/LeaderboardsDemo/Scripts/LeaderboardUIController.cs
deleted file mode 100644
index 74140e2..0000000
--- a/Assets/Samples/LeaderboardsDemo/Scripts/LeaderboardUIController.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-using UnityEngine;
-using TaloGameServices;
-using UnityEngine.UIElements;
-using System.Threading.Tasks;
-using System;
-using System.Collections.Generic;
-
-public class LeaderboardUIController : MonoBehaviour
-{
-    public string leaderboardName;
-    public bool includeArchived;
-
-    private VisualElement root;
-    private ListView entriesList;
-    private Label infoLabel;
-
-    private int filterIdx;
-    private string filter = "All";
-
-    private async void Start()
-    {
-        root = GetComponent<UIDocument>().rootVisualElement;
-        root.Q<Button>("post-btn").clicked += OnPostClick;
-        root.Q<Button>("filter-btn").clicked += OnFilterClick;
-
-        entriesList = root.Q<ListView>();
-        infoLabel = root.Q<Label>("info");
-
-        if (string.IsNullOrEmpty(leaderboardName))
-        {
-            throw new Exception("Please create a leaderboard and set the leaderboard name to its internal name");
-        }
-
-        await LoadEntries();
-    }
-
-    private async void OnPostClick()
-    {
-        var username = root.Q<TextField>().text;
-        var score = UnityEngine.Random.Range(0, 100);
-        var team = UnityEngine.Random.Range(0, 2) == 0 ? "Blue" : "Red";
-
-        await Talo.Players.Identify("username", username);
-        (LeaderboardEntry entry, bool updated) = await Talo.Leaderboards.AddEntry(
-            leaderboardName,
-            score,
-            ("team", team)
-        );
-
-        infoLabel.text = $"You scored {score} for the {team} team.";
-        if (updated) infoLabel.text += " Your highscore was updated!";
-
-        entriesList.Rebuild();
-    }
-
-    private void HandleListVisibility()
-    {
-        if (Talo.Leaderboards.GetCachedEntries(leaderboardName).Count == 0)
-        {
-            infoLabel.text = "There are currently no entries";
-        }
-        else
-        {
-            infoLabel.text = "";
-        }
-    }
-
-    private async Task LoadEntries()
-    {
-        var page = 0;
-        var done = false;
-
-        do
-        {
-            try
-            {
-                var res = await Talo.Leaderboards.GetEntries(leaderboardName, page, includeArchived: includeArchived);
-                page++;
-                done = res.isLastPage;
-            }
-            catch (RequestException e)
-            {
-                if (e.responseCode == 404)
-                {
-                    infoLabel.text = $"Failed loading leaderboard {leaderboardName}. Does it exist?";
-                }
-                else
-                {
-                    infoLabel.text = e.Message;
-                    Debug.LogError(e);
-                }
-                return;
-            }
-
-        } while (!done);
-        
-        HandleListVisibility();
-
-        entriesList.makeItem = () =>
-        {
-            var label = new Label();
-            label.style.color = new StyleColor(Color.white);
-            label.style.fontSize = 22;
-
-            return label;
-        };
-
-        entriesList.bindItem = (e, i) =>
-        {
-            LeaderboardEntry entry = entriesList.itemsSource[i] as LeaderboardEntry;
-            var teamText = entry.GetProp("team", "No");
-            var archivedText = !string.IsNullOrEmpty(entry.deletedAt) ? " (archived)" : "";
-            e.Q<Label>().text = $"{i+1}. {entry.playerAlias.identifier} - {entry.score} ({teamText} team){archivedText}";
-        };
-
-        entriesList.itemsSource = Talo.Leaderboards.GetCachedEntries(leaderboardName);
-    }
-
-    private string GetNextFilter(int idx)
-    {
-        return new [] { "All", "Blue", "Red" } [idx % 3];
-    }
-
-    private void OnFilterClick()
-    {
-        filterIdx++;
-        filter = GetNextFilter(filterIdx);
-
-        infoLabel.text = $"Filtering on {filter.ToLower()}";
-        root.Q<Button>("filter-btn").text = $"{GetNextFilter(filterIdx + 1)} team scores";
-
-        if (filter == "All")
-        {
-            entriesList.itemsSource = Talo.Leaderboards.GetCachedEntries(leaderboardName);
-        }
-        else
-        {
-            entriesList.itemsSource = new List<LeaderboardEntry>(Talo.Leaderboards.GetCachedEntries(leaderboardName)
-                .FindAll((e) => e.GetProp("team", "") == filter));
-        }
-
-        entriesList.Rebuild();
-    }
-}
diff --git a/Assets/Samples/Playground/Scripts/Continuity/ToggleContinuity.cs b/Assets/Samples/Playground/Scripts/Continuity/ToggleContinuity.cs
deleted file mode 100644
index bacbf94..0000000
--- a/Assets/Samples/Playground/Scripts/Continuity/ToggleContinuity.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using UnityEngine;
-using TaloGameServices;
-using UnityEngine.UI;
-
-public class ToggleContinuity : MonoBehaviour
-{
-    private void Start()
-    {
-        SetText();
-    }
-
-    private bool GetValue()
-    {
-        return Talo.Settings.continuityEnabled;
-    }
-
-    private void SetText()
-    {
-        GetComponentInChildren<Text>().text = GetValue() ? "Toggle off" : "Toggle on";
-    }
-
-    public void OnButtonClick()
-    {
-        Talo.Settings.continuityEnabled = !Talo.Settings.continuityEnabled;
-        SetText();
-
-        ResponseMessage.SetText($"Continuity is now {(Talo.Settings.continuityEnabled ? "enabled" : "disabled")}");
-    }
-}
diff --git a/Assets/Samples/Playground/Scripts/Continuity/ToggleOfflineMode.cs b/Assets/Samples/Playground/Scripts/Continuity/ToggleOfflineMode.cs
deleted file mode 100644
index bfc650b..0000000
--- a/Assets/Samples/Playground/Scripts/Continuity/ToggleOfflineMode.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using UnityEngine;
-using TaloGameServices;
-using UnityEngine.UI;
-
-public class ToggleOfflineMode : MonoBehaviour
-{
-    private void Start()
-    {
-        SetText();
-    }
-
-    private bool GetValue()
-    {
-        return Talo.Settings.offlineMode;
-    }
-
-    private void SetText()
-    {
-        GetComponentInChildren<Text>().text = GetValue() ? "Go online" : "Go offline";
-    }
-
-    public void OnButtonClick()
-    {
-        Talo.Settings.offlineMode = !Talo.Settings.offlineMode;
-        SetText();
-
-        ResponseMessage.SetText($"You are now now {(Talo.Settings.offlineMode ? "offline" : "online")}");
-    }
-}
diff --git a/Assets/Samples/Playground/Scripts/Events/FlushEvents.cs b/Assets/Samples/Playground/Scripts/Events/FlushEvents.cs
deleted file mode 100644
index 904b85e..0000000
--- a/Assets/Samples/Playground/Scripts/Events/FlushEvents.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using UnityEngine;
-using TaloGameServices;
-using System.Threading.Tasks;
-
-public class FlushEvents : MonoBehaviour
-{
-    public async void OnButtonClick()
-    {
-        await Flush();
-    }
-
-    private async Task Flush()
-    {
-        try
-        {
-            await Talo.Events.Flush();
-
-            ResponseMessage.SetText("Flushed events");
-        }
-        catch (Exception err)
-        {
-            ResponseMessage.SetText(err.Message);
-            throw err;
-        }
-    }
-}
diff --git a/Assets/Samples/Playground/Scripts/Events/TrackEvent.cs b/Assets/Samples/Playground/Scripts/Events/TrackEvent.cs
deleted file mode 100644
index da16e15..0000000
--- a/Assets/Samples/Playground/Scripts/Events/TrackEvent.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using UnityEngine;
-using TaloGameServices;
-using System.Linq;
-using System.Threading.Tasks;
-
-public class TrackEvent : MonoBehaviour
-{
-    public string eventName;
-    public Prop[] props;
-    public bool flushImmediately;
-
-    public async void OnButtonClick()
-    {
-        await Track();
-    }
-
-    private async Task Track()
-    {
-        if (string.IsNullOrEmpty(eventName))
-        {
-            ResponseMessage.SetText("eventName not set on TrackEventButton");
-            return;
-        }
-
-        try
-        {
-            await Talo.Events.Track(eventName, props.Select((prop) => (prop.key, prop.value)).ToArray());
-
-            ResponseMessage.SetText($"{eventName} tracked");
-
-            if (flushImmediately)
-            {
-                await Talo.Events.Flush();
-
-                ResponseMessage.SetText($"{eventName} tracked and events flushed");
-            }
-        }
-        catch (Exception err)
-        {
-            ResponseMessage.SetText(err.Message);
-            throw err;
-        }
-    }
-}
diff --git a/Assets/Samples/Playground/Scripts/Feedback/GetCategories.cs b/Assets/Samples/Playground/Scripts/Feedback/GetCategories.cs
deleted file mode 100644
index 8c9ed8f..0000000
--- a/Assets/Samples/Playground/Scripts/Feedback/GetCategories.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using UnityEngine;
-using TaloGameServices;
-using System.Threading.Tasks;
-using System.Linq;
-
-public class GetCategories : MonoBehaviour
-{
-    public async void OnButtonClick()
-    {
-        await FetchCategories();
-    }
-
-    private async Task FetchCategories()
-    {
-        var categories = await Talo.Feedback.GetCategories();
-
-        if (categories.Length == 0)
-        {
-            ResponseMessage.SetText("No categories found. Create some in the Talo dashboard!");
-        }
-        else
-        {
-            var mapped = categories.Select((c) => $"{c.name} ({c.internalName})");
-            ResponseMessage.SetText($"Categories: " + string.Join(", ", mapped));
-        }
-    }
-}
diff --git a/Assets/Samples/Playground/Scripts/Feedback/SendFeedback.cs b/Assets/Samples/Playground/Scripts/Feedback/SendFeedback.cs
deleted file mode 100644
index b572776..0000000
--- a/Assets/Samples/Playground/Scripts/Feedback/SendFeedback.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using UnityEngine;
-using TaloGameServices;
-using System;
-
-public class SendFeedback : MonoBehaviour
-{
-    public string categoryInternalName, feedbackComment;
-
-    public async void OnButtonClick()
-    {
-        if (string.IsNullOrEmpty(categoryInternalName) || string.IsNullOrEmpty(feedbackComment))
-        {
-            ResponseMessage.SetText("categoryInternalName or feedbackComment not set on SendFeedbackButton");
-            return;
-        }
-
-        try
-        {
-            await Talo.Feedback.Send(categoryInternalName, feedbackComment);
-            ResponseMessage.SetText($"Feedback sent for {categoryInternalName}: {feedbackComment}");
-        }
-        catch (Exception err)
-        {
-            ResponseMessage.SetText(err.Message);
-            throw err;
-        }
-    }
-}
diff --git a/Assets/Samples/Playground/Scripts/Leaderboards/GetLeaderboardEntries.cs b/Assets/Samples/Playground/Scripts/Leaderboards/GetLeaderboardEntries.cs
deleted file mode 100644
index 61f08eb..0000000
--- a/Assets/Samples/Playground/Scripts/Leaderboards/GetLeaderboardEntries.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using TaloGameServices;
-using UnityEngine;
-using System.Linq;
-using System.Threading.Tasks;
-
-public class GetLeaderboardEntries : MonoBehaviour
-{
-    public string leaderboardInternalName;
-    public int page = 0;
-
-    public async void OnButtonClick()
-    {
-        await FetchEntries();
-    }
-
-    private async Task FetchEntries()
-    {
-        if (string.IsNullOrEmpty(leaderboardInternalName))
-        {
-            ResponseMessage.SetText("leaderboardInternalName not set on GetLeaderboardEntriesButton");
-            return;
-        }
-
-        try
-        {
-            int score = UnityEngine.Random.Range(0, 10000);
-            LeaderboardEntriesResponse res = await Talo.Leaderboards.GetEntries(leaderboardInternalName, page);
-            LeaderboardEntry[] entries = res.entries;
-
-            if (entries.Length == 0)
-            {
-                ResponseMessage.SetText($"No entries for page {page}");
-            }
-            else
-            {
-                ResponseMessage.SetText(string.Join(", ", entries.Select((e) => e.ToString()).ToArray()));
-            }
-        }
-        catch (Exception err)
-        {
-            ResponseMessage.SetText(err.Message);
-            throw err;
-        }
-    }
-}
diff --git a/Assets/Samples/Playground/Scripts/Leaderboards/PostLeaderboardEntry.cs b/Assets/Samples/Playground/Scripts/Leaderboards/PostLeaderboardEntry.cs
deleted file mode 100644
index 47167e4..0000000
--- a/Assets/Samples/Playground/Scripts/Leaderboards/PostLeaderboardEntry.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using TaloGameServices;
-using UnityEngine;
-
-public class PostLeaderboardEntry : MonoBehaviour
-{
-    public string leaderboardInternalName;
-
-    public async void OnButtonClick()
-    {
-        await PostEntry();
-    }
-
-    private async Task PostEntry()
-    {
-        if (string.IsNullOrEmpty(leaderboardInternalName))
-        {
-            ResponseMessage.SetText("leaderboardInternalName not set on AddEntryButton");
-            return;
-        }
-
-        try
-        {
-            int score = UnityEngine.Random.Range(0, 10000);
-            (LeaderboardEntry entry, bool updated) = await Talo.Leaderboards.AddEntry(leaderboardInternalName, score);
-
-            ResponseMessage.SetText($"Entry with score {score} added, position is {entry.position}, it was {(updated ? "" : "not")} updated");
-        }
-        catch (Exception err)
-        {
-            ResponseMessage.SetText(err.Message);
-            throw err;
-        }
-    }
-}
diff --git a/Assets/Samples/Playground/Scripts/OpenDocs.cs b/Assets/Samples/Playground/Scripts/OpenDocs.cs
deleted file mode 100644
index 18c7f3a..0000000
--- a/Assets/Samples/Playground/Scripts/OpenDocs.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using UnityEngine;
-
-public class OpenDocs : MonoBehaviour
-{
-    public void OnButtonClick()
-    {
-        Application.OpenURL("https://docs.trytalo.com/docs/unity/install?utm_source=unity-playground");
-    }
-}
diff --git a/Assets/Samples/Playground/Scripts/Players/DeleteProp.cs b/Assets/Samples/Playground/Scripts/Players/DeleteProp.cs
deleted file mode 100644
index a739010..0000000
--- a/Assets/Samples/Playground/Scripts/Players/DeleteProp.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using UnityEngine;
-using TaloGameServices;
-using System.Threading.Tasks;
-using System;
-
-public class DeleteHealthProp : MonoBehaviour
-{
-    public string key;
-
-    public async void OnButtonClick()
-    {
-        await DeleteProp();
-    }
-
-    private async Task DeleteProp()
-    {
-        if (string.IsNullOrEmpty(key))
-        {
-            ResponseMessage.SetText("key not set on DeletePropButton");
-            return;
-        }
-
-        try
-        {
-            await Talo.CurrentPlayer.DeleteProp(key);
-            ResponseMessage.SetText($"{key} deleted");
-        }
-        catch (Exception err)
-        {
-            ResponseMessage.SetText(err.Message);
-            throw err;
-        }
-    }
-}
diff --git a/Assets/Samples/Playground/Scripts/Players/GetGroup.cs b/Assets/Samples/Playground/Scripts/Players/GetGroup.cs
deleted file mode 100644
index b951245..0000000
--- a/Assets/Samples/Playground/Scripts/Players/GetGroup.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using TaloGameServices;
-using UnityEngine;
-
-public class GetGroup : MonoBehaviour
-{
-    public string groupId;
-
-    public async void OnButtonClick()
-    {
-        if (string.IsNullOrEmpty(groupId))
-        {
-            ResponseMessage.SetText("groupId not set on GetGroupButton");
-            return;
-        }
-
-        try
-        {
-            var group = await Talo.PlayerGroups.Get(groupId);
-            ResponseMessage.SetText($"{group.name} has {group.count} player(s)");
-        }
-        catch (Exception e)
-        {
-            ResponseMessage.SetText(e.Message);
-        }
-    }
-}
diff --git a/Assets/Samples/Playground/Scripts/Players/IdentifyPlayer.cs b/Assets/Samples/Playground/Scripts/Players/IdentifyPlayer.cs
deleted file mode 100644
index 475fde9..0000000
--- a/Assets/Samples/Playground/Scripts/Players/IdentifyPlayer.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using UnityEngine;
-using UnityEngine.UI;
-using TaloGameServices;
-using System.Threading.Tasks;
-
-public class IdentifyPlayer : MonoBehaviour
-{
-    public string service, identifier;
-
-    private void Start()
-    {
-        Talo.Players.OnIdentified += OnIdentified;
-    }
-
-    public async void OnButtonClick()
-    {
-        await Identify();
-    }
-
-    private async Task Identify()
-    {
-        if (string.IsNullOrEmpty(service) || string.IsNullOrEmpty(identifier))
-        {
-            ResponseMessage.SetText("service or identifier not set on IdentifyButton");
-            return;
-        }
-
-        try
-        {
-            await Talo.Players.Identify(service, identifier);
-        }
-        catch (Exception err)
-        {
-            ResponseMessage.SetText(err.Message);
-            throw err;
-        }
-    }
-
-    private void OnIdentified(Player player)
-    {
-        var panel = GameObject.Find("APIs");
-        if (panel != null)
-        {
-            ResponseMessage.SetText("Identified!");
-            panel.GetComponent<Image>().color = new Color(120 / 255f, 230 / 255f, 160 / 255f);
-        }
-    }
-}
diff --git a/Assets/Samples/Playground/Scripts/Players/SetProp.cs b/Assets/Samples/Playground/Scripts/Players/SetProp.cs
deleted file mode 100644
index 13e8ff5..0000000
--- a/Assets/Samples/Playground/Scripts/Players/SetProp.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using UnityEngine;
-using TaloGameServices;
-using System.Threading.Tasks;
-
-public class SetProp : MonoBehaviour
-{
-    public string key, value;
-
-    public async void OnButtonClick()
-    {
-        await UpdateProp();
-    }
-
-    private async Task UpdateProp()
-    {
-        if (string.IsNullOrEmpty(key) || string.IsNullOrEmpty(value))
-        {
-            ResponseMessage.SetText("key or value not set on SetPropButton");
-            return;
-        }
-
-        try
-        {
-            await Talo.CurrentPlayer.SetProp(key, value);
-            ResponseMessage.SetText($"{key} set to {value}");
-        }
-        catch (System.Exception err)
-        {
-            ResponseMessage.SetText(err.Message);
-            throw err;
-        }
-    }
-}
diff --git a/Assets/Samples/Playground/Scripts/ResponseMessage.cs b/Assets/Samples/Playground/Scripts/ResponseMessage.cs
deleted file mode 100644
index 46e90aa..0000000
--- a/Assets/Samples/Playground/Scripts/ResponseMessage.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using UnityEngine;
-using UnityEngine.UI;
-
-public class ResponseMessage : MonoBehaviour
-{
-    public static void SetText(string text)
-    {
-        GameObject.Find("Response Message").GetComponent<Text>().text = $"{DateTime.Now.TimeOfDay}: {text}";
-    }
-}
diff --git a/Assets/Samples/Playground/Scripts/Stats/GetAllStats.cs b/Assets/Samples/Playground/Scripts/Stats/GetAllStats.cs
deleted file mode 100644
index 389ec74..0000000
--- a/Assets/Samples/Playground/Scripts/Stats/GetAllStats.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Linq;
-using UnityEngine;
-using TaloGameServices;
-
-public class GetAllStats : MonoBehaviour
-{
-    public void OnButtonClick()
-    {
-        FetchStats();
-    }
-
-    private async void FetchStats()
-    {
-        try
-        {
-            var res = await Talo.Stats.GetStats();
-            var internalNames = res.Length > 0 ? string.Join(", ", res.Select((item) => item.internalName)) : "no stats";
-            ResponseMessage.SetText($"Stats: {internalNames}");
-        }
-        catch (Exception err)
-        {
-            ResponseMessage.SetText(err.Message);
-            throw err;
-        }
-    }
-}
diff --git a/Assets/Samples/Playground/Scripts/Stats/GetGlobalHistory.cs b/Assets/Samples/Playground/Scripts/Stats/GetGlobalHistory.cs
deleted file mode 100644
index 2cddec2..0000000
--- a/Assets/Samples/Playground/Scripts/Stats/GetGlobalHistory.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using UnityEngine;
-using TaloGameServices;
-
-public class GetGlobalHistory : MonoBehaviour
-{
-    public string statInternalName;
-
-    public void OnButtonClick()
-    {
-        FetchGlobalHistory();
-    }
-
-    private async void FetchGlobalHistory()
-    {
-        if (string.IsNullOrEmpty(statInternalName))
-        {
-            ResponseMessage.SetText("statInternalName not set on GetGlobalHistoryButton");
-            return;
-        }
-
-        try
-        {
-            var res = await Talo.Stats.GetGlobalHistory(statInternalName);
-            var globalMetrics = res.globalValue;
-            var playerMetrics = res.playerValue;
-
-            ResponseMessage.SetText(
-                $"Min: {globalMetrics.minValue}, " +
-                $"max: {globalMetrics.maxValue}, " +
-                $"median: {globalMetrics.medianValue}, " +
-                $"average: {globalMetrics.averageValue}, " +
-                $"average change: {globalMetrics.averageChange}, " +
-                $"average player value: {playerMetrics.averageValue}"
-            );
-        }
-        catch (Exception err)
-        {
-            ResponseMessage.SetText(err.Message);
-            throw err;
-        }
-    }
-}
diff --git a/Assets/Samples/Playground/Scripts/Stats/GetStat.cs b/Assets/Samples/Playground/Scripts/Stats/GetStat.cs
deleted file mode 100644
index ed12a10..0000000
--- a/Assets/Samples/Playground/Scripts/Stats/GetStat.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using UnityEngine;
-using TaloGameServices;
-
-public class GetStat : MonoBehaviour
-{
-    public string statInternalName;
-
-    public void OnButtonClick()
-    {
-        FetchStat();
-    }
-
-    private async void FetchStat()
-    {
-        if (string.IsNullOrEmpty(statInternalName))
-        {
-            ResponseMessage.SetText("statInternalName not set on GetStatButton");
-            return;
-        }
-
-        try
-        {
-            var res = await Talo.Stats.GetStat(statInternalName);
-            ResponseMessage.SetText($"{res.name} is{(res.global ? "" : " not")} a global stat, with a default value of {res.defaultValue}");
-        }
-        catch (Exception err)
-        {
-            ResponseMessage.SetText(err.Message);
-            throw err;
-        }
-    }
-}
diff --git a/Assets/Samples/Playground/Scripts/Stats/GetStatHistory.cs b/Assets/Samples/Playground/Scripts/Stats/GetStatHistory.cs
deleted file mode 100644
index c4641e1..0000000
--- a/Assets/Samples/Playground/Scripts/Stats/GetStatHistory.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using UnityEngine;
-using TaloGameServices;
-using System.Linq;
-
-public class GetStatHistory : MonoBehaviour
-{
-    public string statInternalName;
-
-    public void OnButtonClick()
-    {
-        FetchHistory();
-    }
-
-    private async void FetchHistory()
-    {
-        if (string.IsNullOrEmpty(statInternalName))
-        {
-            ResponseMessage.SetText("statInternalName not set on GetStatHistoryButton");
-            return;
-        }
-
-        try
-        {
-            var res = await Talo.Stats.GetHistory(statInternalName);
-            var changeString = res.count > 0 ? string.Join(", ", res.history.Select((item) => item.change)) : "no changes";
-
-            ResponseMessage.SetText($"{statInternalName} changed by: {changeString}");
-        }
-        catch (Exception err)
-        {
-            ResponseMessage.SetText(err.Message);
-            throw err;
-        }
-    }
-}
diff --git a/Assets/Samples/Playground/Scripts/Stats/TrackStat.cs b/Assets/Samples/Playground/Scripts/Stats/TrackStat.cs
deleted file mode 100644
index c509184..0000000
--- a/Assets/Samples/Playground/Scripts/Stats/TrackStat.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using UnityEngine;
-using TaloGameServices;
-
-public class TrackStat : MonoBehaviour
-{
-    public string statInternalName;
-    public float change = 1;
-
-    public void OnButtonClick()
-    {
-        Track();
-    }
-
-    private async void Track()
-    {
-        if (string.IsNullOrEmpty(statInternalName))
-        {
-            ResponseMessage.SetText("statInternalName not set on TrackStatButton");
-            return;
-        }
-
-        try
-        {
-            var res = await Talo.Stats.Track(statInternalName, change);
-
-            ResponseMessage.SetText($"{statInternalName} changed by {change}, new value is {res.playerStat.value}");
-        }
-        catch (Exception err)
-        {
-            ResponseMessage.SetText(err.Message);
-            throw err;
-        }
-    }
-}
diff --git a/Packages/com.trytalo.talo/Tests/Runtime.meta b/Assets/Talo Game Services.meta
similarity index 77%
rename from Packages/com.trytalo.talo/Tests/Runtime.meta
rename to Assets/Talo Game Services.meta
index 7bbfaa3..a7eda20 100644
--- a/Packages/com.trytalo.talo/Tests/Runtime.meta
+++ b/Assets/Talo Game Services.meta	
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c8cf492c978b04a9c94b72e2d8a59591
+guid: bc54cb4c668b64c16bc1540946e4cb37
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/Talo Game Services/Talo.meta b/Assets/Talo Game Services/Talo.meta
new file mode 100644
index 0000000..3d29610
--- /dev/null
+++ b/Assets/Talo Game Services/Talo.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3713b77fb8d484eb593293fd82a770e7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Talo Game Services/Talo/README.md b/Assets/Talo Game Services/Talo/README.md
new file mode 100644
index 0000000..e9acabf
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/README.md	
@@ -0,0 +1,27 @@
+# Talo Unity Package
+
+Talo is the easiest way to integrate leaderboards, stats, event tracking and more into your game.
+
+## Getting started
+
+For more in-depth instructions, check out our [getting started guide](https://docs.trytalo.com/docs/unity/install).
+
+1. Import Talo into your project
+2. Create an Access Key in the Talo web dashboard
+3. Create a settings asset in your `Resources` folder by right-clicking it and selecting `Create > Talo > Settings Asset`
+4. Update the settings asset with your Access Key
+5. Check out Talo's features in the `Playground` sample
+
+## Documentation
+
+The [full Talo docs](https://docs.trytalo.com) contain setup instructions, detailed API docs/examples and configuration options.
+
+You can find links to documentation for Talo's services and APIs including leaderboards, event tracking, player authentication and more in the docs.
+
+## Self-hosting your own Talo instance
+
+Talo is designed to be easily self-hosted. Take a look at our [self-hosting guide](https://docs.trytalo.com/docs/selfhosting/overview) and the [GitHub repo](https://github.com/TaloDev/hosting) for examples on how to get started.
+
+## Support
+
+[Join us on Discord](https://trytalo.com/discord) to connect with other developers and get help from the Talo team.
diff --git a/Packages/com.trytalo.talo/package.json.meta b/Assets/Talo Game Services/Talo/README.md.meta
similarity index 60%
rename from Packages/com.trytalo.talo/package.json.meta
rename to Assets/Talo Game Services/Talo/README.md.meta
index 520ac2b..364c6ed 100644
--- a/Packages/com.trytalo.talo/package.json.meta
+++ b/Assets/Talo Game Services/Talo/README.md.meta	
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 517ff9a0f03cf2547a8ebb7c040cd7b9
-PackageManifestImporter:
+guid: 882ad2e5410464a13a2a10963de19ee0
+TextScriptImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 
diff --git a/Packages/com.trytalo.talo/Runtime.meta b/Assets/Talo Game Services/Talo/Runtime.meta
similarity index 77%
rename from Packages/com.trytalo.talo/Runtime.meta
rename to Assets/Talo Game Services/Talo/Runtime.meta
index f5d2a6d..48f9d75 100644
--- a/Packages/com.trytalo.talo/Runtime.meta
+++ b/Assets/Talo Game Services/Talo/Runtime.meta	
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d23d002b79e23d64e99150e80124961c
+guid: 4a0ee1e902d5f4451a0ccbed6d809953
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Packages/com.trytalo.talo/Runtime/APIs.meta b/Assets/Talo Game Services/Talo/Runtime/APIs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/APIs.meta
rename to Assets/Talo Game Services/Talo/Runtime/APIs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/APIs/BaseAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/BaseAPI.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/APIs/BaseAPI.cs
rename to Assets/Talo Game Services/Talo/Runtime/APIs/BaseAPI.cs
diff --git a/Packages/com.trytalo.talo/Runtime/APIs/BaseAPI.cs.meta b/Assets/Talo Game Services/Talo/Runtime/APIs/BaseAPI.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/APIs/BaseAPI.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/APIs/BaseAPI.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/APIs/ChannelsAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/APIs/ChannelsAPI.cs
rename to Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs
diff --git a/Packages/com.trytalo.talo/Runtime/APIs/ChannelsAPI.cs.meta b/Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/APIs/ChannelsAPI.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/APIs/ContinuityAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/ContinuityAPI.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/APIs/ContinuityAPI.cs
rename to Assets/Talo Game Services/Talo/Runtime/APIs/ContinuityAPI.cs
diff --git a/Packages/com.trytalo.talo/Runtime/APIs/ContinuityAPI.cs.meta b/Assets/Talo Game Services/Talo/Runtime/APIs/ContinuityAPI.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/APIs/ContinuityAPI.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/APIs/ContinuityAPI.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/APIs/EventsAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/EventsAPI.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/APIs/EventsAPI.cs
rename to Assets/Talo Game Services/Talo/Runtime/APIs/EventsAPI.cs
diff --git a/Packages/com.trytalo.talo/Runtime/APIs/EventsAPI.cs.meta b/Assets/Talo Game Services/Talo/Runtime/APIs/EventsAPI.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/APIs/EventsAPI.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/APIs/EventsAPI.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/APIs/FeedbackAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/FeedbackAPI.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/APIs/FeedbackAPI.cs
rename to Assets/Talo Game Services/Talo/Runtime/APIs/FeedbackAPI.cs
diff --git a/Packages/com.trytalo.talo/Runtime/APIs/FeedbackAPI.cs.meta b/Assets/Talo Game Services/Talo/Runtime/APIs/FeedbackAPI.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/APIs/FeedbackAPI.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/APIs/FeedbackAPI.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/APIs/GameConfigAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/GameConfigAPI.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/APIs/GameConfigAPI.cs
rename to Assets/Talo Game Services/Talo/Runtime/APIs/GameConfigAPI.cs
diff --git a/Packages/com.trytalo.talo/Runtime/APIs/GameConfigAPI.cs.meta b/Assets/Talo Game Services/Talo/Runtime/APIs/GameConfigAPI.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/APIs/GameConfigAPI.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/APIs/GameConfigAPI.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/APIs/HealthCheckAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/HealthCheckAPI.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/APIs/HealthCheckAPI.cs
rename to Assets/Talo Game Services/Talo/Runtime/APIs/HealthCheckAPI.cs
diff --git a/Packages/com.trytalo.talo/Runtime/APIs/HealthCheckAPI.cs.meta b/Assets/Talo Game Services/Talo/Runtime/APIs/HealthCheckAPI.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/APIs/HealthCheckAPI.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/APIs/HealthCheckAPI.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/APIs/LeaderboardsAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/LeaderboardsAPI.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/APIs/LeaderboardsAPI.cs
rename to Assets/Talo Game Services/Talo/Runtime/APIs/LeaderboardsAPI.cs
diff --git a/Packages/com.trytalo.talo/Runtime/APIs/LeaderboardsAPI.cs.meta b/Assets/Talo Game Services/Talo/Runtime/APIs/LeaderboardsAPI.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/APIs/LeaderboardsAPI.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/APIs/LeaderboardsAPI.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/APIs/PlayerAuthAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/PlayerAuthAPI.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/APIs/PlayerAuthAPI.cs
rename to Assets/Talo Game Services/Talo/Runtime/APIs/PlayerAuthAPI.cs
diff --git a/Packages/com.trytalo.talo/Runtime/APIs/PlayerAuthAPI.cs.meta b/Assets/Talo Game Services/Talo/Runtime/APIs/PlayerAuthAPI.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/APIs/PlayerAuthAPI.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/APIs/PlayerAuthAPI.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/APIs/PlayerGroupsAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/PlayerGroupsAPI.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/APIs/PlayerGroupsAPI.cs
rename to Assets/Talo Game Services/Talo/Runtime/APIs/PlayerGroupsAPI.cs
diff --git a/Packages/com.trytalo.talo/Runtime/APIs/PlayerGroupsAPI.cs.meta b/Assets/Talo Game Services/Talo/Runtime/APIs/PlayerGroupsAPI.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/APIs/PlayerGroupsAPI.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/APIs/PlayerGroupsAPI.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/APIs/PlayerPresenceAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/PlayerPresenceAPI.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/APIs/PlayerPresenceAPI.cs
rename to Assets/Talo Game Services/Talo/Runtime/APIs/PlayerPresenceAPI.cs
diff --git a/Packages/com.trytalo.talo/Runtime/APIs/PlayerPresenceAPI.cs.meta b/Assets/Talo Game Services/Talo/Runtime/APIs/PlayerPresenceAPI.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/APIs/PlayerPresenceAPI.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/APIs/PlayerPresenceAPI.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/APIs/PlayersAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/PlayersAPI.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/APIs/PlayersAPI.cs
rename to Assets/Talo Game Services/Talo/Runtime/APIs/PlayersAPI.cs
diff --git a/Packages/com.trytalo.talo/Runtime/APIs/PlayersAPI.cs.meta b/Assets/Talo Game Services/Talo/Runtime/APIs/PlayersAPI.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/APIs/PlayersAPI.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/APIs/PlayersAPI.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/APIs/SavesAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/SavesAPI.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/APIs/SavesAPI.cs
rename to Assets/Talo Game Services/Talo/Runtime/APIs/SavesAPI.cs
diff --git a/Packages/com.trytalo.talo/Runtime/APIs/SavesAPI.cs.meta b/Assets/Talo Game Services/Talo/Runtime/APIs/SavesAPI.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/APIs/SavesAPI.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/APIs/SavesAPI.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/APIs/SocketTicketsAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/SocketTicketsAPI.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/APIs/SocketTicketsAPI.cs
rename to Assets/Talo Game Services/Talo/Runtime/APIs/SocketTicketsAPI.cs
diff --git a/Packages/com.trytalo.talo/Runtime/APIs/SocketTicketsAPI.cs.meta b/Assets/Talo Game Services/Talo/Runtime/APIs/SocketTicketsAPI.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/APIs/SocketTicketsAPI.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/APIs/SocketTicketsAPI.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/APIs/StatsAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/StatsAPI.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/APIs/StatsAPI.cs
rename to Assets/Talo Game Services/Talo/Runtime/APIs/StatsAPI.cs
diff --git a/Packages/com.trytalo.talo/Runtime/APIs/StatsAPI.cs.meta b/Assets/Talo Game Services/Talo/Runtime/APIs/StatsAPI.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/APIs/StatsAPI.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/APIs/StatsAPI.cs.meta
diff --git a/Assets/Talo Game Services/Talo/Runtime/AssemblyInfo.cs b/Assets/Talo Game Services/Talo/Runtime/AssemblyInfo.cs
new file mode 100644
index 0000000..1f6b871
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Runtime/AssemblyInfo.cs	
@@ -0,0 +1,3 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Talo.Tests")]
diff --git a/Assets/Talo Game Services/Talo/Runtime/AssemblyInfo.cs.meta b/Assets/Talo Game Services/Talo/Runtime/AssemblyInfo.cs.meta
new file mode 100644
index 0000000..0b271ff
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Runtime/AssemblyInfo.cs.meta	
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: a059a3bb17a484764984558b3e417190
\ No newline at end of file
diff --git a/Packages/com.trytalo.talo/Runtime/Entities.meta b/Assets/Talo Game Services/Talo/Runtime/Entities.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities.meta
rename to Assets/Talo Game Services/Talo/Runtime/Entities.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/Channel.cs b/Assets/Talo Game Services/Talo/Runtime/Entities/Channel.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/Channel.cs
rename to Assets/Talo Game Services/Talo/Runtime/Entities/Channel.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/Channel.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Entities/Channel.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/Channel.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Entities/Channel.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/EntityWithProps.cs b/Assets/Talo Game Services/Talo/Runtime/Entities/EntityWithProps.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/EntityWithProps.cs
rename to Assets/Talo Game Services/Talo/Runtime/Entities/EntityWithProps.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/EntityWithProps.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Entities/EntityWithProps.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/EntityWithProps.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Entities/EntityWithProps.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/Event.cs b/Assets/Talo Game Services/Talo/Runtime/Entities/Event.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/Event.cs
rename to Assets/Talo Game Services/Talo/Runtime/Entities/Event.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/Event.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Entities/Event.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/Event.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Entities/Event.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/FeedbackCategory.cs b/Assets/Talo Game Services/Talo/Runtime/Entities/FeedbackCategory.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/FeedbackCategory.cs
rename to Assets/Talo Game Services/Talo/Runtime/Entities/FeedbackCategory.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/FeedbackCategory.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Entities/FeedbackCategory.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/FeedbackCategory.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Entities/FeedbackCategory.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/GameSave.cs b/Assets/Talo Game Services/Talo/Runtime/Entities/GameSave.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/GameSave.cs
rename to Assets/Talo Game Services/Talo/Runtime/Entities/GameSave.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/GameSave.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Entities/GameSave.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/GameSave.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Entities/GameSave.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/Group.cs b/Assets/Talo Game Services/Talo/Runtime/Entities/Group.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/Group.cs
rename to Assets/Talo Game Services/Talo/Runtime/Entities/Group.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/Group.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Entities/Group.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/Group.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Entities/Group.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/GroupStub.cs b/Assets/Talo Game Services/Talo/Runtime/Entities/GroupStub.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/GroupStub.cs
rename to Assets/Talo Game Services/Talo/Runtime/Entities/GroupStub.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/GroupStub.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Entities/GroupStub.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/GroupStub.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Entities/GroupStub.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/ILoadable.cs b/Assets/Talo Game Services/Talo/Runtime/Entities/ILoadable.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/ILoadable.cs
rename to Assets/Talo Game Services/Talo/Runtime/Entities/ILoadable.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/ILoadable.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Entities/ILoadable.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/ILoadable.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Entities/ILoadable.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/LeaderboardEntry.cs b/Assets/Talo Game Services/Talo/Runtime/Entities/LeaderboardEntry.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/LeaderboardEntry.cs
rename to Assets/Talo Game Services/Talo/Runtime/Entities/LeaderboardEntry.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/LeaderboardEntry.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Entities/LeaderboardEntry.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/LeaderboardEntry.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Entities/LeaderboardEntry.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/LiveConfig.cs b/Assets/Talo Game Services/Talo/Runtime/Entities/LiveConfig.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/LiveConfig.cs
rename to Assets/Talo Game Services/Talo/Runtime/Entities/LiveConfig.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/LiveConfig.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Entities/LiveConfig.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/LiveConfig.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Entities/LiveConfig.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/Loadable.cs b/Assets/Talo Game Services/Talo/Runtime/Entities/Loadable.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/Loadable.cs
rename to Assets/Talo Game Services/Talo/Runtime/Entities/Loadable.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/Loadable.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Entities/Loadable.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/Loadable.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Entities/Loadable.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/LoadableData.cs b/Assets/Talo Game Services/Talo/Runtime/Entities/LoadableData.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/LoadableData.cs
rename to Assets/Talo Game Services/Talo/Runtime/Entities/LoadableData.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/LoadableData.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Entities/LoadableData.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/LoadableData.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Entities/LoadableData.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/OfflineSavesContent.cs b/Assets/Talo Game Services/Talo/Runtime/Entities/OfflineSavesContent.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/OfflineSavesContent.cs
rename to Assets/Talo Game Services/Talo/Runtime/Entities/OfflineSavesContent.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/OfflineSavesContent.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Entities/OfflineSavesContent.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/OfflineSavesContent.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Entities/OfflineSavesContent.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/Player.cs b/Assets/Talo Game Services/Talo/Runtime/Entities/Player.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/Player.cs
rename to Assets/Talo Game Services/Talo/Runtime/Entities/Player.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/Player.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Entities/Player.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/Player.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Entities/Player.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/PlayerAlias.cs b/Assets/Talo Game Services/Talo/Runtime/Entities/PlayerAlias.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/PlayerAlias.cs
rename to Assets/Talo Game Services/Talo/Runtime/Entities/PlayerAlias.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/PlayerAlias.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Entities/PlayerAlias.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/PlayerAlias.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Entities/PlayerAlias.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/PlayerPresence.cs b/Assets/Talo Game Services/Talo/Runtime/Entities/PlayerPresence.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/PlayerPresence.cs
rename to Assets/Talo Game Services/Talo/Runtime/Entities/PlayerPresence.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/PlayerPresence.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Entities/PlayerPresence.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/PlayerPresence.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Entities/PlayerPresence.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/PlayerStat.cs b/Assets/Talo Game Services/Talo/Runtime/Entities/PlayerStat.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/PlayerStat.cs
rename to Assets/Talo Game Services/Talo/Runtime/Entities/PlayerStat.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/PlayerStat.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Entities/PlayerStat.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/PlayerStat.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Entities/PlayerStat.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/PlayerStatSnapshot.cs b/Assets/Talo Game Services/Talo/Runtime/Entities/PlayerStatSnapshot.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/PlayerStatSnapshot.cs
rename to Assets/Talo Game Services/Talo/Runtime/Entities/PlayerStatSnapshot.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/PlayerStatSnapshot.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Entities/PlayerStatSnapshot.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/PlayerStatSnapshot.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Entities/PlayerStatSnapshot.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/Prop.cs b/Assets/Talo Game Services/Talo/Runtime/Entities/Prop.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/Prop.cs
rename to Assets/Talo Game Services/Talo/Runtime/Entities/Prop.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/Prop.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Entities/Prop.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/Prop.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Entities/Prop.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/SaveContent.cs b/Assets/Talo Game Services/Talo/Runtime/Entities/SaveContent.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/SaveContent.cs
rename to Assets/Talo Game Services/Talo/Runtime/Entities/SaveContent.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/SaveContent.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Entities/SaveContent.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/SaveContent.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Entities/SaveContent.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/Stat.cs b/Assets/Talo Game Services/Talo/Runtime/Entities/Stat.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/Stat.cs
rename to Assets/Talo Game Services/Talo/Runtime/Entities/Stat.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Entities/Stat.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Entities/Stat.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Entities/Stat.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Entities/Stat.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Requests.meta b/Assets/Talo Game Services/Talo/Runtime/Requests.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests.meta
rename to Assets/Talo Game Services/Talo/Runtime/Requests.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/ChannelsCreateRequest.cs b/Assets/Talo Game Services/Talo/Runtime/Requests/ChannelsCreateRequest.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/ChannelsCreateRequest.cs
rename to Assets/Talo Game Services/Talo/Runtime/Requests/ChannelsCreateRequest.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/ChannelsCreateRequest.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Requests/ChannelsCreateRequest.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/ChannelsCreateRequest.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Requests/ChannelsCreateRequest.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/ChannelsUpdateOwnerRequest.cs b/Assets/Talo Game Services/Talo/Runtime/Requests/ChannelsUpdateOwnerRequest.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/ChannelsUpdateOwnerRequest.cs
rename to Assets/Talo Game Services/Talo/Runtime/Requests/ChannelsUpdateOwnerRequest.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/ChannelsUpdateOwnerRequest.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Requests/ChannelsUpdateOwnerRequest.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/ChannelsUpdateOwnerRequest.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Requests/ChannelsUpdateOwnerRequest.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/ChannelsUpdateRequest.cs b/Assets/Talo Game Services/Talo/Runtime/Requests/ChannelsUpdateRequest.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/ChannelsUpdateRequest.cs
rename to Assets/Talo Game Services/Talo/Runtime/Requests/ChannelsUpdateRequest.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/ChannelsUpdateRequest.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Requests/ChannelsUpdateRequest.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/ChannelsUpdateRequest.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Requests/ChannelsUpdateRequest.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/EventsPostRequest.cs b/Assets/Talo Game Services/Talo/Runtime/Requests/EventsPostRequest.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/EventsPostRequest.cs
rename to Assets/Talo Game Services/Talo/Runtime/Requests/EventsPostRequest.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/EventsPostRequest.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Requests/EventsPostRequest.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/EventsPostRequest.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Requests/EventsPostRequest.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/FeedbackPostRequest.cs b/Assets/Talo Game Services/Talo/Runtime/Requests/FeedbackPostRequest.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/FeedbackPostRequest.cs
rename to Assets/Talo Game Services/Talo/Runtime/Requests/FeedbackPostRequest.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/FeedbackPostRequest.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Requests/FeedbackPostRequest.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/FeedbackPostRequest.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Requests/FeedbackPostRequest.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/LeaderboardsPostRequest.cs b/Assets/Talo Game Services/Talo/Runtime/Requests/LeaderboardsPostRequest.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/LeaderboardsPostRequest.cs
rename to Assets/Talo Game Services/Talo/Runtime/Requests/LeaderboardsPostRequest.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/LeaderboardsPostRequest.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Requests/LeaderboardsPostRequest.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/LeaderboardsPostRequest.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Requests/LeaderboardsPostRequest.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthChangeEmailRequest.cs b/Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthChangeEmailRequest.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthChangeEmailRequest.cs
rename to Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthChangeEmailRequest.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthChangeEmailRequest.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthChangeEmailRequest.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthChangeEmailRequest.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthChangeEmailRequest.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthChangePasswordRequest.cs b/Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthChangePasswordRequest.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthChangePasswordRequest.cs
rename to Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthChangePasswordRequest.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthChangePasswordRequest.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthChangePasswordRequest.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthChangePasswordRequest.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthChangePasswordRequest.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthDeleteAccountRequest.cs b/Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthDeleteAccountRequest.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthDeleteAccountRequest.cs
rename to Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthDeleteAccountRequest.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthDeleteAccountRequest.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthDeleteAccountRequest.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthDeleteAccountRequest.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthDeleteAccountRequest.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthForgotPasswordRequest.cs b/Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthForgotPasswordRequest.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthForgotPasswordRequest.cs
rename to Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthForgotPasswordRequest.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthForgotPasswordRequest.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthForgotPasswordRequest.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthForgotPasswordRequest.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthForgotPasswordRequest.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthLoginRequest.cs b/Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthLoginRequest.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthLoginRequest.cs
rename to Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthLoginRequest.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthLoginRequest.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthLoginRequest.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthLoginRequest.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthLoginRequest.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthRegisterRequest.cs b/Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthRegisterRequest.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthRegisterRequest.cs
rename to Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthRegisterRequest.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthRegisterRequest.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthRegisterRequest.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthRegisterRequest.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthRegisterRequest.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthResetPasswordRequest.cs b/Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthResetPasswordRequest.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthResetPasswordRequest.cs
rename to Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthResetPasswordRequest.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthResetPasswordRequest.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthResetPasswordRequest.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthResetPasswordRequest.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthResetPasswordRequest.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthToggleVerificationRequest.cs b/Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthToggleVerificationRequest.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthToggleVerificationRequest.cs
rename to Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthToggleVerificationRequest.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthToggleVerificationRequest.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthToggleVerificationRequest.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthToggleVerificationRequest.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthToggleVerificationRequest.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthVerifyRequest.cs b/Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthVerifyRequest.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthVerifyRequest.cs
rename to Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthVerifyRequest.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthVerifyRequest.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthVerifyRequest.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/PlayerAuthVerifyRequest.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthVerifyRequest.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/PlayerPresenceUpdateRequest.cs b/Assets/Talo Game Services/Talo/Runtime/Requests/PlayerPresenceUpdateRequest.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/PlayerPresenceUpdateRequest.cs
rename to Assets/Talo Game Services/Talo/Runtime/Requests/PlayerPresenceUpdateRequest.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/PlayerPresenceUpdateRequest.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Requests/PlayerPresenceUpdateRequest.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/PlayerPresenceUpdateRequest.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Requests/PlayerPresenceUpdateRequest.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/PlayersMergeRequest.cs b/Assets/Talo Game Services/Talo/Runtime/Requests/PlayersMergeRequest.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/PlayersMergeRequest.cs
rename to Assets/Talo Game Services/Talo/Runtime/Requests/PlayersMergeRequest.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/PlayersMergeRequest.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Requests/PlayersMergeRequest.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/PlayersMergeRequest.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Requests/PlayersMergeRequest.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/SavesPatchRequest.cs b/Assets/Talo Game Services/Talo/Runtime/Requests/SavesPatchRequest.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/SavesPatchRequest.cs
rename to Assets/Talo Game Services/Talo/Runtime/Requests/SavesPatchRequest.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/SavesPatchRequest.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Requests/SavesPatchRequest.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/SavesPatchRequest.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Requests/SavesPatchRequest.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/SavesPostRequest.cs b/Assets/Talo Game Services/Talo/Runtime/Requests/SavesPostRequest.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/SavesPostRequest.cs
rename to Assets/Talo Game Services/Talo/Runtime/Requests/SavesPostRequest.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/SavesPostRequest.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Requests/SavesPostRequest.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/SavesPostRequest.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Requests/SavesPostRequest.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/StatsPutRequest.cs b/Assets/Talo Game Services/Talo/Runtime/Requests/StatsPutRequest.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/StatsPutRequest.cs
rename to Assets/Talo Game Services/Talo/Runtime/Requests/StatsPutRequest.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Requests/StatsPutRequest.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Requests/StatsPutRequest.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Requests/StatsPutRequest.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Requests/StatsPutRequest.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Responses.meta b/Assets/Talo Game Services/Talo/Runtime/Responses.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses.meta
rename to Assets/Talo Game Services/Talo/Runtime/Responses.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/ChannelResponse.cs b/Assets/Talo Game Services/Talo/Runtime/Responses/ChannelResponse.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/ChannelResponse.cs
rename to Assets/Talo Game Services/Talo/Runtime/Responses/ChannelResponse.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/ChannelResponse.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Responses/ChannelResponse.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/ChannelResponse.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Responses/ChannelResponse.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/ChannelsIndexResponse.cs b/Assets/Talo Game Services/Talo/Runtime/Responses/ChannelsIndexResponse.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/ChannelsIndexResponse.cs
rename to Assets/Talo Game Services/Talo/Runtime/Responses/ChannelsIndexResponse.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/ChannelsIndexResponse.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Responses/ChannelsIndexResponse.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/ChannelsIndexResponse.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Responses/ChannelsIndexResponse.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/ChannelsSubscriptionsResponse.cs b/Assets/Talo Game Services/Talo/Runtime/Responses/ChannelsSubscriptionsResponse.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/ChannelsSubscriptionsResponse.cs
rename to Assets/Talo Game Services/Talo/Runtime/Responses/ChannelsSubscriptionsResponse.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/ChannelsSubscriptionsResponse.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Responses/ChannelsSubscriptionsResponse.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/ChannelsSubscriptionsResponse.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Responses/ChannelsSubscriptionsResponse.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/ErrorResponse.cs b/Assets/Talo Game Services/Talo/Runtime/Responses/ErrorResponse.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/ErrorResponse.cs
rename to Assets/Talo Game Services/Talo/Runtime/Responses/ErrorResponse.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/ErrorResponse.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Responses/ErrorResponse.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/ErrorResponse.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Responses/ErrorResponse.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/FeedbackCategoriesResponse.cs b/Assets/Talo Game Services/Talo/Runtime/Responses/FeedbackCategoriesResponse.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/FeedbackCategoriesResponse.cs
rename to Assets/Talo Game Services/Talo/Runtime/Responses/FeedbackCategoriesResponse.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/FeedbackCategoriesResponse.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Responses/FeedbackCategoriesResponse.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/FeedbackCategoriesResponse.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Responses/FeedbackCategoriesResponse.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/GameConfigResponse.cs b/Assets/Talo Game Services/Talo/Runtime/Responses/GameConfigResponse.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/GameConfigResponse.cs
rename to Assets/Talo Game Services/Talo/Runtime/Responses/GameConfigResponse.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/GameConfigResponse.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Responses/GameConfigResponse.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/GameConfigResponse.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Responses/GameConfigResponse.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/LeaderboardEntriesResponse.cs b/Assets/Talo Game Services/Talo/Runtime/Responses/LeaderboardEntriesResponse.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/LeaderboardEntriesResponse.cs
rename to Assets/Talo Game Services/Talo/Runtime/Responses/LeaderboardEntriesResponse.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/LeaderboardEntriesResponse.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Responses/LeaderboardEntriesResponse.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/LeaderboardEntriesResponse.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Responses/LeaderboardEntriesResponse.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/LeaderboardEntryResponse.cs b/Assets/Talo Game Services/Talo/Runtime/Responses/LeaderboardEntryResponse.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/LeaderboardEntryResponse.cs
rename to Assets/Talo Game Services/Talo/Runtime/Responses/LeaderboardEntryResponse.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/LeaderboardEntryResponse.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Responses/LeaderboardEntryResponse.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/LeaderboardEntryResponse.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Responses/LeaderboardEntryResponse.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/PlayerAuthLoginResponse.cs b/Assets/Talo Game Services/Talo/Runtime/Responses/PlayerAuthLoginResponse.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/PlayerAuthLoginResponse.cs
rename to Assets/Talo Game Services/Talo/Runtime/Responses/PlayerAuthLoginResponse.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/PlayerAuthLoginResponse.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Responses/PlayerAuthLoginResponse.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/PlayerAuthLoginResponse.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Responses/PlayerAuthLoginResponse.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/PlayerAuthSessionResponse.cs b/Assets/Talo Game Services/Talo/Runtime/Responses/PlayerAuthSessionResponse.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/PlayerAuthSessionResponse.cs
rename to Assets/Talo Game Services/Talo/Runtime/Responses/PlayerAuthSessionResponse.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/PlayerAuthSessionResponse.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Responses/PlayerAuthSessionResponse.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/PlayerAuthSessionResponse.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Responses/PlayerAuthSessionResponse.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/PlayerGroupsGetResponse.cs b/Assets/Talo Game Services/Talo/Runtime/Responses/PlayerGroupsGetResponse.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/PlayerGroupsGetResponse.cs
rename to Assets/Talo Game Services/Talo/Runtime/Responses/PlayerGroupsGetResponse.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/PlayerGroupsGetResponse.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Responses/PlayerGroupsGetResponse.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/PlayerGroupsGetResponse.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Responses/PlayerGroupsGetResponse.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/PlayersFindResponse.cs b/Assets/Talo Game Services/Talo/Runtime/Responses/PlayersFindResponse.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/PlayersFindResponse.cs
rename to Assets/Talo Game Services/Talo/Runtime/Responses/PlayersFindResponse.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/PlayersFindResponse.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Responses/PlayersFindResponse.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/PlayersFindResponse.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Responses/PlayersFindResponse.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/PlayersIdentifyResponse.cs b/Assets/Talo Game Services/Talo/Runtime/Responses/PlayersIdentifyResponse.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/PlayersIdentifyResponse.cs
rename to Assets/Talo Game Services/Talo/Runtime/Responses/PlayersIdentifyResponse.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/PlayersIdentifyResponse.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Responses/PlayersIdentifyResponse.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/PlayersIdentifyResponse.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Responses/PlayersIdentifyResponse.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/PlayersUpdateResponse.cs b/Assets/Talo Game Services/Talo/Runtime/Responses/PlayersUpdateResponse.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/PlayersUpdateResponse.cs
rename to Assets/Talo Game Services/Talo/Runtime/Responses/PlayersUpdateResponse.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/PlayersUpdateResponse.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Responses/PlayersUpdateResponse.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/PlayersUpdateResponse.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Responses/PlayersUpdateResponse.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/PresenceResponse.cs b/Assets/Talo Game Services/Talo/Runtime/Responses/PresenceResponse.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/PresenceResponse.cs
rename to Assets/Talo Game Services/Talo/Runtime/Responses/PresenceResponse.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/PresenceResponse.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Responses/PresenceResponse.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/PresenceResponse.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Responses/PresenceResponse.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/SavesIndexResponse.cs b/Assets/Talo Game Services/Talo/Runtime/Responses/SavesIndexResponse.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/SavesIndexResponse.cs
rename to Assets/Talo Game Services/Talo/Runtime/Responses/SavesIndexResponse.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/SavesIndexResponse.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Responses/SavesIndexResponse.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/SavesIndexResponse.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Responses/SavesIndexResponse.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/SavesPostResponse.cs b/Assets/Talo Game Services/Talo/Runtime/Responses/SavesPostResponse.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/SavesPostResponse.cs
rename to Assets/Talo Game Services/Talo/Runtime/Responses/SavesPostResponse.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/SavesPostResponse.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Responses/SavesPostResponse.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/SavesPostResponse.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Responses/SavesPostResponse.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/SocketTicketsCreateResponse.cs b/Assets/Talo Game Services/Talo/Runtime/Responses/SocketTicketsCreateResponse.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/SocketTicketsCreateResponse.cs
rename to Assets/Talo Game Services/Talo/Runtime/Responses/SocketTicketsCreateResponse.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/SocketTicketsCreateResponse.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Responses/SocketTicketsCreateResponse.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/SocketTicketsCreateResponse.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Responses/SocketTicketsCreateResponse.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/StatResponse.cs b/Assets/Talo Game Services/Talo/Runtime/Responses/StatResponse.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/StatResponse.cs
rename to Assets/Talo Game Services/Talo/Runtime/Responses/StatResponse.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/StatResponse.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Responses/StatResponse.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/StatResponse.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Responses/StatResponse.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/StatsGlobalHistoryResponse.cs b/Assets/Talo Game Services/Talo/Runtime/Responses/StatsGlobalHistoryResponse.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/StatsGlobalHistoryResponse.cs
rename to Assets/Talo Game Services/Talo/Runtime/Responses/StatsGlobalHistoryResponse.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/StatsGlobalHistoryResponse.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Responses/StatsGlobalHistoryResponse.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/StatsGlobalHistoryResponse.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Responses/StatsGlobalHistoryResponse.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/StatsHistoryResponse.cs b/Assets/Talo Game Services/Talo/Runtime/Responses/StatsHistoryResponse.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/StatsHistoryResponse.cs
rename to Assets/Talo Game Services/Talo/Runtime/Responses/StatsHistoryResponse.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/StatsHistoryResponse.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Responses/StatsHistoryResponse.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/StatsHistoryResponse.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Responses/StatsHistoryResponse.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/StatsIndexResponse.cs b/Assets/Talo Game Services/Talo/Runtime/Responses/StatsIndexResponse.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/StatsIndexResponse.cs
rename to Assets/Talo Game Services/Talo/Runtime/Responses/StatsIndexResponse.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/StatsIndexResponse.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Responses/StatsIndexResponse.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/StatsIndexResponse.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Responses/StatsIndexResponse.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/StatsPutResponse.cs b/Assets/Talo Game Services/Talo/Runtime/Responses/StatsPutResponse.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/StatsPutResponse.cs
rename to Assets/Talo Game Services/Talo/Runtime/Responses/StatsPutResponse.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Responses/StatsPutResponse.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Responses/StatsPutResponse.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Responses/StatsPutResponse.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Responses/StatsPutResponse.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/SocketRequests.meta b/Assets/Talo Game Services/Talo/Runtime/SocketRequests.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/SocketRequests.meta
rename to Assets/Talo Game Services/Talo/Runtime/SocketRequests.meta
diff --git a/Packages/com.trytalo.talo/Runtime/SocketRequests/ChannelMessageRequest.cs b/Assets/Talo Game Services/Talo/Runtime/SocketRequests/ChannelMessageRequest.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/SocketRequests/ChannelMessageRequest.cs
rename to Assets/Talo Game Services/Talo/Runtime/SocketRequests/ChannelMessageRequest.cs
diff --git a/Packages/com.trytalo.talo/Runtime/SocketRequests/ChannelMessageRequest.cs.meta b/Assets/Talo Game Services/Talo/Runtime/SocketRequests/ChannelMessageRequest.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/SocketRequests/ChannelMessageRequest.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/SocketRequests/ChannelMessageRequest.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/SocketRequests/IdentifyPlayer.cs b/Assets/Talo Game Services/Talo/Runtime/SocketRequests/IdentifyPlayer.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/SocketRequests/IdentifyPlayer.cs
rename to Assets/Talo Game Services/Talo/Runtime/SocketRequests/IdentifyPlayer.cs
diff --git a/Packages/com.trytalo.talo/Runtime/SocketRequests/IdentifyPlayer.cs.meta b/Assets/Talo Game Services/Talo/Runtime/SocketRequests/IdentifyPlayer.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/SocketRequests/IdentifyPlayer.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/SocketRequests/IdentifyPlayer.cs.meta
diff --git a/Assets/Talo Game Services/Talo/Runtime/SocketRequests/SocketRequest.cs b/Assets/Talo Game Services/Talo/Runtime/SocketRequests/SocketRequest.cs
new file mode 100644
index 0000000..f050c3a
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Runtime/SocketRequests/SocketRequest.cs	
@@ -0,0 +1,16 @@
+namespace TaloGameServices
+{
+    [System.Serializable]
+    public class SocketRequest<T>
+    {
+        public string req;
+
+        public T data;
+
+        public SocketRequest(string requestType, T requestData) 
+        {
+            req = requestType;
+            data = requestData;
+        }
+    }
+}
diff --git a/Packages/com.trytalo.talo/Runtime/SocketRequests/SocketRequest.cs.meta b/Assets/Talo Game Services/Talo/Runtime/SocketRequests/SocketRequest.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/SocketRequests/SocketRequest.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/SocketRequests/SocketRequest.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/SocketResponses.meta b/Assets/Talo Game Services/Talo/Runtime/SocketResponses.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/SocketResponses.meta
rename to Assets/Talo Game Services/Talo/Runtime/SocketResponses.meta
diff --git a/Packages/com.trytalo.talo/Runtime/SocketResponses/ChannelDeletedResponse.cs b/Assets/Talo Game Services/Talo/Runtime/SocketResponses/ChannelDeletedResponse.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/SocketResponses/ChannelDeletedResponse.cs
rename to Assets/Talo Game Services/Talo/Runtime/SocketResponses/ChannelDeletedResponse.cs
diff --git a/Packages/com.trytalo.talo/Runtime/SocketResponses/ChannelDeletedResponse.cs.meta b/Assets/Talo Game Services/Talo/Runtime/SocketResponses/ChannelDeletedResponse.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/SocketResponses/ChannelDeletedResponse.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/SocketResponses/ChannelDeletedResponse.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/SocketResponses/ChannelJoinedResponse.cs b/Assets/Talo Game Services/Talo/Runtime/SocketResponses/ChannelJoinedResponse.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/SocketResponses/ChannelJoinedResponse.cs
rename to Assets/Talo Game Services/Talo/Runtime/SocketResponses/ChannelJoinedResponse.cs
diff --git a/Packages/com.trytalo.talo/Runtime/SocketResponses/ChannelJoinedResponse.cs.meta b/Assets/Talo Game Services/Talo/Runtime/SocketResponses/ChannelJoinedResponse.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/SocketResponses/ChannelJoinedResponse.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/SocketResponses/ChannelJoinedResponse.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/SocketResponses/ChannelLeftResponse.cs b/Assets/Talo Game Services/Talo/Runtime/SocketResponses/ChannelLeftResponse.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/SocketResponses/ChannelLeftResponse.cs
rename to Assets/Talo Game Services/Talo/Runtime/SocketResponses/ChannelLeftResponse.cs
diff --git a/Packages/com.trytalo.talo/Runtime/SocketResponses/ChannelLeftResponse.cs.meta b/Assets/Talo Game Services/Talo/Runtime/SocketResponses/ChannelLeftResponse.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/SocketResponses/ChannelLeftResponse.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/SocketResponses/ChannelLeftResponse.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/SocketResponses/ChannelMessageResponse.cs b/Assets/Talo Game Services/Talo/Runtime/SocketResponses/ChannelMessageResponse.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/SocketResponses/ChannelMessageResponse.cs
rename to Assets/Talo Game Services/Talo/Runtime/SocketResponses/ChannelMessageResponse.cs
diff --git a/Packages/com.trytalo.talo/Runtime/SocketResponses/ChannelMessageResponse.cs.meta b/Assets/Talo Game Services/Talo/Runtime/SocketResponses/ChannelMessageResponse.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/SocketResponses/ChannelMessageResponse.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/SocketResponses/ChannelMessageResponse.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/SocketResponses/ChannelOwnershipTransferredResponse.cs b/Assets/Talo Game Services/Talo/Runtime/SocketResponses/ChannelOwnershipTransferredResponse.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/SocketResponses/ChannelOwnershipTransferredResponse.cs
rename to Assets/Talo Game Services/Talo/Runtime/SocketResponses/ChannelOwnershipTransferredResponse.cs
diff --git a/Packages/com.trytalo.talo/Runtime/SocketResponses/ChannelOwnershipTransferredResponse.cs.meta b/Assets/Talo Game Services/Talo/Runtime/SocketResponses/ChannelOwnershipTransferredResponse.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/SocketResponses/ChannelOwnershipTransferredResponse.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/SocketResponses/ChannelOwnershipTransferredResponse.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/SocketResponses/PlayerPresenceUpdatedResponse.cs b/Assets/Talo Game Services/Talo/Runtime/SocketResponses/PlayerPresenceUpdatedResponse.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/SocketResponses/PlayerPresenceUpdatedResponse.cs
rename to Assets/Talo Game Services/Talo/Runtime/SocketResponses/PlayerPresenceUpdatedResponse.cs
diff --git a/Packages/com.trytalo.talo/Runtime/SocketResponses/PlayerPresenceUpdatedResponse.cs.meta b/Assets/Talo Game Services/Talo/Runtime/SocketResponses/PlayerPresenceUpdatedResponse.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/SocketResponses/PlayerPresenceUpdatedResponse.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/SocketResponses/PlayerPresenceUpdatedResponse.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/SocketResponses/SocketError.cs b/Assets/Talo Game Services/Talo/Runtime/SocketResponses/SocketError.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/SocketResponses/SocketError.cs
rename to Assets/Talo Game Services/Talo/Runtime/SocketResponses/SocketError.cs
diff --git a/Packages/com.trytalo.talo/Runtime/SocketResponses/SocketError.cs.meta b/Assets/Talo Game Services/Talo/Runtime/SocketResponses/SocketError.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/SocketResponses/SocketError.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/SocketResponses/SocketError.cs.meta
diff --git a/Assets/Talo Game Services/Talo/Runtime/SocketResponses/SocketResponse.cs b/Assets/Talo Game Services/Talo/Runtime/SocketResponses/SocketResponse.cs
new file mode 100644
index 0000000..66f44c3
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Runtime/SocketResponses/SocketResponse.cs	
@@ -0,0 +1,32 @@
+using UnityEngine;
+
+namespace TaloGameServices
+{
+    [System.Serializable]
+    public class SocketResponse
+    {
+        private class SocketMessage<T>
+        {
+            public string res;
+            public T data;
+        }
+
+        public string message;
+
+        public SocketResponse(string message) 
+        {
+            this.message = message;
+        }
+
+        public string GetResponseType()
+        {
+            var message = JsonUtility.FromJson<SocketMessage<object>>(this.message);
+            return message.res;
+        }
+
+        public T GetData<T>()
+        {
+            return JsonUtility.FromJson<SocketMessage<T>>(message).data;
+        }
+    }
+}
diff --git a/Packages/com.trytalo.talo/Runtime/SocketResponses/SocketResponse.cs.meta b/Assets/Talo Game Services/Talo/Runtime/SocketResponses/SocketResponse.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/SocketResponses/SocketResponse.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/SocketResponses/SocketResponse.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Talo.cs b/Assets/Talo Game Services/Talo/Runtime/Talo.cs
similarity index 95%
rename from Packages/com.trytalo.talo/Runtime/Talo.cs
rename to Assets/Talo Game Services/Talo/Runtime/Talo.cs
index 54a30e3..f594cc5 100644
--- a/Packages/com.trytalo.talo/Runtime/Talo.cs
+++ b/Assets/Talo Game Services/Talo/Runtime/Talo.cs	
@@ -61,7 +61,7 @@ public static LiveConfig LiveConfig
             get {
                 if (_liveConfig == null)
                 {
-                    throw new Exception("Live config needs to be inited first - use Talo.GameConfig.Get() to fetch it");
+                    throw new Exception("Live config needs to be initialised first - use Talo.GameConfig.Get() to fetch it.");
                 }
                 return _liveConfig;
             }
@@ -142,7 +142,7 @@ static Talo()
                 var settings = Resources.Load<TaloSettings>("Talo Settings");
                 if (!settings)
                 {
-                    Debug.LogError("A 'Talo Settings' asset was not found in the Resources folder. Create one using the Create menu > Talo > Settings Asset");
+                    Debug.LogError("A 'Talo Settings' asset was not found in the Resources folder. Create one using the Create menu > Talo > Settings Asset.");
                     return;
                 }
 
diff --git a/Packages/com.trytalo.talo/Runtime/Talo.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Talo.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Talo.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Talo.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/TaloManager.cs b/Assets/Talo Game Services/Talo/Runtime/TaloManager.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/TaloManager.cs
rename to Assets/Talo Game Services/Talo/Runtime/TaloManager.cs
diff --git a/Packages/com.trytalo.talo/Runtime/TaloManager.cs.meta b/Assets/Talo Game Services/Talo/Runtime/TaloManager.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/TaloManager.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/TaloManager.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Talo.GameServices.Runtime.asmdef b/Assets/Talo Game Services/Talo/Runtime/TaloRuntime.asmdef
similarity index 90%
rename from Packages/com.trytalo.talo/Runtime/Talo.GameServices.Runtime.asmdef
rename to Assets/Talo Game Services/Talo/Runtime/TaloRuntime.asmdef
index 0eda99f..5f980a6 100644
--- a/Packages/com.trytalo.talo/Runtime/Talo.GameServices.Runtime.asmdef
+++ b/Assets/Talo Game Services/Talo/Runtime/TaloRuntime.asmdef	
@@ -1,5 +1,5 @@
 {
-    "name": "Talo.GameServices.Runtime",
+    "name": "Talo.Runtime",
     "rootNamespace": "",
     "references": [
         "GUID:ec04f0f3ab74a4ab6a7355917322ba3e"
diff --git a/Packages/com.trytalo.talo/Tests/Runtime/Talo.GameServices.RuntimeTests.asmdef.meta b/Assets/Talo Game Services/Talo/Runtime/TaloRuntime.asmdef.meta
similarity index 76%
rename from Packages/com.trytalo.talo/Tests/Runtime/Talo.GameServices.RuntimeTests.asmdef.meta
rename to Assets/Talo Game Services/Talo/Runtime/TaloRuntime.asmdef.meta
index 89f7501..3d913d1 100644
--- a/Packages/com.trytalo.talo/Tests/Runtime/Talo.GameServices.RuntimeTests.asmdef.meta
+++ b/Assets/Talo Game Services/Talo/Runtime/TaloRuntime.asmdef.meta	
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: cef163917f4234921a12447ee60fe2c1
+guid: acc2e053631d04b5db0e9a4fe61784ff
 AssemblyDefinitionImporter:
   externalObjects: {}
   userData: 
diff --git a/Packages/com.trytalo.talo/Runtime/TaloSettings.cs b/Assets/Talo Game Services/Talo/Runtime/TaloSettings.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/TaloSettings.cs
rename to Assets/Talo Game Services/Talo/Runtime/TaloSettings.cs
diff --git a/Packages/com.trytalo.talo/Runtime/TaloSettings.cs.meta b/Assets/Talo Game Services/Talo/Runtime/TaloSettings.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/TaloSettings.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/TaloSettings.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/TaloSocket.cs b/Assets/Talo Game Services/Talo/Runtime/TaloSocket.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/TaloSocket.cs
rename to Assets/Talo Game Services/Talo/Runtime/TaloSocket.cs
diff --git a/Packages/com.trytalo.talo/Runtime/TaloSocket.cs.meta b/Assets/Talo Game Services/Talo/Runtime/TaloSocket.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/TaloSocket.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/TaloSocket.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Utils.meta b/Assets/Talo Game Services/Talo/Runtime/Utils.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Utils.meta
rename to Assets/Talo Game Services/Talo/Runtime/Utils.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/ContinuityManager.cs b/Assets/Talo Game Services/Talo/Runtime/Utils/ContinuityManager.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Utils/ContinuityManager.cs
rename to Assets/Talo Game Services/Talo/Runtime/Utils/ContinuityManager.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/ContinuityManager.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Utils/ContinuityManager.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Utils/ContinuityManager.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Utils/ContinuityManager.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/ContinuityReplayException.cs b/Assets/Talo Game Services/Talo/Runtime/Utils/ContinuityReplayException.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Utils/ContinuityReplayException.cs
rename to Assets/Talo Game Services/Talo/Runtime/Utils/ContinuityReplayException.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/ContinuityReplayException.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Utils/ContinuityReplayException.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Utils/ContinuityReplayException.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Utils/ContinuityReplayException.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/CryptoManager.cs b/Assets/Talo Game Services/Talo/Runtime/Utils/CryptoManager.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Utils/CryptoManager.cs
rename to Assets/Talo Game Services/Talo/Runtime/Utils/CryptoManager.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/CryptoManager.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Utils/CryptoManager.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Utils/CryptoManager.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Utils/CryptoManager.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/FileHandlers.meta b/Assets/Talo Game Services/Talo/Runtime/Utils/FileHandlers.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Utils/FileHandlers.meta
rename to Assets/Talo Game Services/Talo/Runtime/Utils/FileHandlers.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/FileHandlers/CryptoFileHandler.cs b/Assets/Talo Game Services/Talo/Runtime/Utils/FileHandlers/CryptoFileHandler.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Utils/FileHandlers/CryptoFileHandler.cs
rename to Assets/Talo Game Services/Talo/Runtime/Utils/FileHandlers/CryptoFileHandler.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/FileHandlers/CryptoFileHandler.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Utils/FileHandlers/CryptoFileHandler.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Utils/FileHandlers/CryptoFileHandler.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Utils/FileHandlers/CryptoFileHandler.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/FileHandlers/CryptoTestFileHandler.cs b/Assets/Talo Game Services/Talo/Runtime/Utils/FileHandlers/CryptoTestFileHandler.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Utils/FileHandlers/CryptoTestFileHandler.cs
rename to Assets/Talo Game Services/Talo/Runtime/Utils/FileHandlers/CryptoTestFileHandler.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/FileHandlers/CryptoTestFileHandler.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Utils/FileHandlers/CryptoTestFileHandler.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Utils/FileHandlers/CryptoTestFileHandler.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Utils/FileHandlers/CryptoTestFileHandler.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/FileHandlers/IFileHandler.cs b/Assets/Talo Game Services/Talo/Runtime/Utils/FileHandlers/IFileHandler.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Utils/FileHandlers/IFileHandler.cs
rename to Assets/Talo Game Services/Talo/Runtime/Utils/FileHandlers/IFileHandler.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/FileHandlers/IFileHandler.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Utils/FileHandlers/IFileHandler.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Utils/FileHandlers/IFileHandler.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Utils/FileHandlers/IFileHandler.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/FileHandlers/SavesFileHandler.cs b/Assets/Talo Game Services/Talo/Runtime/Utils/FileHandlers/SavesFileHandler.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Utils/FileHandlers/SavesFileHandler.cs
rename to Assets/Talo Game Services/Talo/Runtime/Utils/FileHandlers/SavesFileHandler.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/FileHandlers/SavesFileHandler.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Utils/FileHandlers/SavesFileHandler.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Utils/FileHandlers/SavesFileHandler.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Utils/FileHandlers/SavesFileHandler.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/FileHandlers/SavesTestFileHandler.cs b/Assets/Talo Game Services/Talo/Runtime/Utils/FileHandlers/SavesTestFileHandler.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Utils/FileHandlers/SavesTestFileHandler.cs
rename to Assets/Talo Game Services/Talo/Runtime/Utils/FileHandlers/SavesTestFileHandler.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/FileHandlers/SavesTestFileHandler.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Utils/FileHandlers/SavesTestFileHandler.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Utils/FileHandlers/SavesTestFileHandler.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Utils/FileHandlers/SavesTestFileHandler.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/HttpHeader.cs b/Assets/Talo Game Services/Talo/Runtime/Utils/HttpHeader.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Utils/HttpHeader.cs
rename to Assets/Talo Game Services/Talo/Runtime/Utils/HttpHeader.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/HttpHeader.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Utils/HttpHeader.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Utils/HttpHeader.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Utils/HttpHeader.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/LeaderboardEntriesManager.cs b/Assets/Talo Game Services/Talo/Runtime/Utils/LeaderboardEntriesManager.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Utils/LeaderboardEntriesManager.cs
rename to Assets/Talo Game Services/Talo/Runtime/Utils/LeaderboardEntriesManager.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/LeaderboardEntriesManager.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Utils/LeaderboardEntriesManager.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Utils/LeaderboardEntriesManager.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Utils/LeaderboardEntriesManager.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/PlayerAuthException.cs b/Assets/Talo Game Services/Talo/Runtime/Utils/PlayerAuthException.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Utils/PlayerAuthException.cs
rename to Assets/Talo Game Services/Talo/Runtime/Utils/PlayerAuthException.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/PlayerAuthException.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Utils/PlayerAuthException.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Utils/PlayerAuthException.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Utils/PlayerAuthException.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/RequestException.cs b/Assets/Talo Game Services/Talo/Runtime/Utils/RequestException.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Utils/RequestException.cs
rename to Assets/Talo Game Services/Talo/Runtime/Utils/RequestException.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/RequestException.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Utils/RequestException.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Utils/RequestException.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Utils/RequestException.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/RequestMock.cs b/Assets/Talo Game Services/Talo/Runtime/Utils/RequestMock.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Utils/RequestMock.cs
rename to Assets/Talo Game Services/Talo/Runtime/Utils/RequestMock.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/RequestMock.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Utils/RequestMock.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Utils/RequestMock.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Utils/RequestMock.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/SessionManager.cs b/Assets/Talo Game Services/Talo/Runtime/Utils/SessionManager.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Utils/SessionManager.cs
rename to Assets/Talo Game Services/Talo/Runtime/Utils/SessionManager.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/SessionManager.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Utils/SessionManager.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Utils/SessionManager.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Utils/SessionManager.cs.meta
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/SocketException.cs b/Assets/Talo Game Services/Talo/Runtime/Utils/SocketException.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Utils/SocketException.cs
rename to Assets/Talo Game Services/Talo/Runtime/Utils/SocketException.cs
diff --git a/Packages/com.trytalo.talo/Runtime/Utils/SocketException.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Utils/SocketException.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Runtime/Utils/SocketException.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Utils/SocketException.cs.meta
diff --git a/Assets/Talo Game Services/Talo/Runtime/Vendor.meta b/Assets/Talo Game Services/Talo/Runtime/Vendor.meta
new file mode 100644
index 0000000..43ea952
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Runtime/Vendor.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 672f0111a372247659a0a1b9b2d30b40
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Talo Game Services/Talo/Runtime/Vendor/com.mikeschweitzer.websocket b/Assets/Talo Game Services/Talo/Runtime/Vendor/com.mikeschweitzer.websocket
new file mode 160000
index 0000000..02ad65c
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Runtime/Vendor/com.mikeschweitzer.websocket	
@@ -0,0 +1 @@
+Subproject commit 02ad65ccf3ef8322b008789ad2e434dbaf376be5
diff --git a/Assets/Talo Game Services/Talo/Runtime/Vendor/com.mikeschweitzer.websocket.meta b/Assets/Talo Game Services/Talo/Runtime/Vendor/com.mikeschweitzer.websocket.meta
new file mode 100644
index 0000000..601866b
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Runtime/Vendor/com.mikeschweitzer.websocket.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 903a21b5161624f6a84fc1838b56b707
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Samples.meta b/Assets/Talo Game Services/Talo/Samples.meta
similarity index 100%
rename from Assets/Samples.meta
rename to Assets/Talo Game Services/Talo/Samples.meta
diff --git a/Assets/Samples/AuthenticationDemo.meta b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo.meta
similarity index 100%
rename from Assets/Samples/AuthenticationDemo.meta
rename to Assets/Talo Game Services/Talo/Samples/AuthenticationDemo.meta
diff --git a/Assets/Samples/AuthenticationDemo/Scenes.meta b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scenes.meta
similarity index 100%
rename from Assets/Samples/AuthenticationDemo/Scenes.meta
rename to Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scenes.meta
diff --git a/Assets/Samples/AuthenticationDemo/Scenes/AuthenticationDemo.unity b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scenes/AuthenticationDemo.unity
similarity index 100%
rename from Assets/Samples/AuthenticationDemo/Scenes/AuthenticationDemo.unity
rename to Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scenes/AuthenticationDemo.unity
diff --git a/Assets/Samples/AuthenticationDemo/Scenes/AuthenticationDemo.unity.meta b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scenes/AuthenticationDemo.unity.meta
similarity index 100%
rename from Assets/Samples/AuthenticationDemo/Scenes/AuthenticationDemo.unity.meta
rename to Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scenes/AuthenticationDemo.unity.meta
diff --git a/Assets/Samples/AuthenticationDemo/Scripts.meta b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts.meta
similarity index 100%
rename from Assets/Samples/AuthenticationDemo/Scripts.meta
rename to Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts.meta
diff --git a/Assets/Samples/AuthenticationDemo/Scripts/GameUIController.cs b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/GameUIController.cs
similarity index 93%
rename from Assets/Samples/AuthenticationDemo/Scripts/GameUIController.cs
rename to Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/GameUIController.cs
index d55d75e..09f6eb1 100644
--- a/Assets/Samples/AuthenticationDemo/Scripts/GameUIController.cs
+++ b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/GameUIController.cs	
@@ -1,8 +1,7 @@
 using UnityEngine;
-using TaloGameServices;
 using UnityEngine.UIElements;
 
-namespace TaloAuthenticationDemo
+namespace TaloGameServices.Sample.AuthenticationDemo
 {
     public class GameUIController : MonoBehaviour
     {
diff --git a/Assets/Samples/AuthenticationDemo/Scripts/GameUIController.cs.meta b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/GameUIController.cs.meta
similarity index 100%
rename from Assets/Samples/AuthenticationDemo/Scripts/GameUIController.cs.meta
rename to Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/GameUIController.cs.meta
diff --git a/Assets/Samples/AuthenticationDemo/Scripts/GlobalUIController.cs b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/GlobalUIController.cs
similarity index 95%
rename from Assets/Samples/AuthenticationDemo/Scripts/GlobalUIController.cs
rename to Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/GlobalUIController.cs
index eb520b8..8a53114 100644
--- a/Assets/Samples/AuthenticationDemo/Scripts/GlobalUIController.cs
+++ b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/GlobalUIController.cs	
@@ -1,8 +1,7 @@
 using UnityEngine;
 using UnityEngine.UIElements;
-using TaloGameServices;
 
-namespace TaloAuthenticationDemo
+namespace TaloGameServices.Sample.AuthenticationDemo
 {
     public class GlobalUIController : MonoBehaviour
     {
diff --git a/Assets/Samples/AuthenticationDemo/Scripts/GlobalUIController.cs.meta b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/GlobalUIController.cs.meta
similarity index 100%
rename from Assets/Samples/AuthenticationDemo/Scripts/GlobalUIController.cs.meta
rename to Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/GlobalUIController.cs.meta
diff --git a/Assets/Samples/AuthenticationDemo/Scripts/LoginUIController.cs b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/LoginUIController.cs
similarity index 97%
rename from Assets/Samples/AuthenticationDemo/Scripts/LoginUIController.cs
rename to Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/LoginUIController.cs
index e037dda..39ec58e 100644
--- a/Assets/Samples/AuthenticationDemo/Scripts/LoginUIController.cs
+++ b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/LoginUIController.cs	
@@ -1,9 +1,8 @@
 using UnityEngine;
-using TaloGameServices;
 using UnityEngine.UIElements;
 using System;
 
-namespace TaloAuthenticationDemo
+namespace TaloGameServices.Sample.AuthenticationDemo
 {
     public class LoginUIController : MonoBehaviour
     {
diff --git a/Assets/Samples/AuthenticationDemo/Scripts/LoginUIController.cs.meta b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/LoginUIController.cs.meta
similarity index 100%
rename from Assets/Samples/AuthenticationDemo/Scripts/LoginUIController.cs.meta
rename to Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/LoginUIController.cs.meta
diff --git a/Assets/Samples/AuthenticationDemo/Scripts/RegisterUIController.cs b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/RegisterUIController.cs
similarity index 97%
rename from Assets/Samples/AuthenticationDemo/Scripts/RegisterUIController.cs
rename to Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/RegisterUIController.cs
index a81b95c..c676ab6 100644
--- a/Assets/Samples/AuthenticationDemo/Scripts/RegisterUIController.cs
+++ b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/RegisterUIController.cs	
@@ -1,9 +1,8 @@
 using UnityEngine;
-using TaloGameServices;
 using UnityEngine.UIElements;
 using System;
 
-namespace TaloAuthenticationDemo
+namespace TaloGameServices.Sample.AuthenticationDemo
 {
     public class RegisterUIController : MonoBehaviour
     {
diff --git a/Assets/Samples/AuthenticationDemo/Scripts/RegisterUIController.cs.meta b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/RegisterUIController.cs.meta
similarity index 100%
rename from Assets/Samples/AuthenticationDemo/Scripts/RegisterUIController.cs.meta
rename to Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/RegisterUIController.cs.meta
diff --git a/Assets/Samples/AuthenticationDemo/Scripts/VerifyUIController.cs b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/VerifyUIController.cs
similarity index 95%
rename from Assets/Samples/AuthenticationDemo/Scripts/VerifyUIController.cs
rename to Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/VerifyUIController.cs
index 07e9921..1c31b18 100644
--- a/Assets/Samples/AuthenticationDemo/Scripts/VerifyUIController.cs
+++ b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/VerifyUIController.cs	
@@ -1,9 +1,8 @@
 using UnityEngine;
-using TaloGameServices;
 using UnityEngine.UIElements;
 using System;
 
-namespace TaloAuthenticationDemo
+namespace TaloGameServices.Sample.AuthenticationDemo
 {
     public class VerifyUIController : MonoBehaviour
     {
diff --git a/Assets/Samples/AuthenticationDemo/Scripts/VerifyUIController.cs.meta b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/VerifyUIController.cs.meta
similarity index 100%
rename from Assets/Samples/AuthenticationDemo/Scripts/VerifyUIController.cs.meta
rename to Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/VerifyUIController.cs.meta
diff --git a/Assets/Samples/AuthenticationDemo/Settings.meta b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Settings.meta
similarity index 100%
rename from Assets/Samples/AuthenticationDemo/Settings.meta
rename to Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Settings.meta
diff --git a/Assets/Samples/AuthenticationDemo/Settings/Panel Settings.asset b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Settings/Panel Settings.asset
similarity index 100%
rename from Assets/Samples/AuthenticationDemo/Settings/Panel Settings.asset
rename to Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Settings/Panel Settings.asset
diff --git a/Assets/Samples/AuthenticationDemo/Settings/Panel Settings.asset.meta b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Settings/Panel Settings.asset.meta
similarity index 100%
rename from Assets/Samples/AuthenticationDemo/Settings/Panel Settings.asset.meta
rename to Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Settings/Panel Settings.asset.meta
diff --git a/Assets/Samples/AuthenticationDemo/Settings/UnityDefaultRuntimeTheme.tss b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Settings/UnityDefaultRuntimeTheme.tss
similarity index 100%
rename from Assets/Samples/AuthenticationDemo/Settings/UnityDefaultRuntimeTheme.tss
rename to Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Settings/UnityDefaultRuntimeTheme.tss
diff --git a/Assets/Samples/AuthenticationDemo/Settings/UnityDefaultRuntimeTheme.tss.meta b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Settings/UnityDefaultRuntimeTheme.tss.meta
similarity index 100%
rename from Assets/Samples/AuthenticationDemo/Settings/UnityDefaultRuntimeTheme.tss.meta
rename to Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Settings/UnityDefaultRuntimeTheme.tss.meta
diff --git a/Assets/Samples/AuthenticationDemo/UI.meta b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/UI.meta
similarity index 100%
rename from Assets/Samples/AuthenticationDemo/UI.meta
rename to Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/UI.meta
diff --git a/Assets/Samples/AuthenticationDemo/UI/AuthenticationUI.uss b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/UI/AuthenticationUI.uss
similarity index 100%
rename from Assets/Samples/AuthenticationDemo/UI/AuthenticationUI.uss
rename to Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/UI/AuthenticationUI.uss
diff --git a/Assets/Samples/AuthenticationDemo/UI/AuthenticationUI.uss.meta b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/UI/AuthenticationUI.uss.meta
similarity index 100%
rename from Assets/Samples/AuthenticationDemo/UI/AuthenticationUI.uss.meta
rename to Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/UI/AuthenticationUI.uss.meta
diff --git a/Assets/Samples/AuthenticationDemo/UI/GameUI.uxml b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/UI/GameUI.uxml
similarity index 100%
rename from Assets/Samples/AuthenticationDemo/UI/GameUI.uxml
rename to Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/UI/GameUI.uxml
diff --git a/Assets/Samples/AuthenticationDemo/UI/GameUI.uxml.meta b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/UI/GameUI.uxml.meta
similarity index 100%
rename from Assets/Samples/AuthenticationDemo/UI/GameUI.uxml.meta
rename to Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/UI/GameUI.uxml.meta
diff --git a/Assets/Samples/AuthenticationDemo/UI/LoginUI.uxml b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/UI/LoginUI.uxml
similarity index 100%
rename from Assets/Samples/AuthenticationDemo/UI/LoginUI.uxml
rename to Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/UI/LoginUI.uxml
diff --git a/Assets/Samples/AuthenticationDemo/UI/LoginUI.uxml.meta b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/UI/LoginUI.uxml.meta
similarity index 100%
rename from Assets/Samples/AuthenticationDemo/UI/LoginUI.uxml.meta
rename to Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/UI/LoginUI.uxml.meta
diff --git a/Assets/Samples/AuthenticationDemo/UI/RegisterUI.uxml b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/UI/RegisterUI.uxml
similarity index 100%
rename from Assets/Samples/AuthenticationDemo/UI/RegisterUI.uxml
rename to Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/UI/RegisterUI.uxml
diff --git a/Assets/Samples/AuthenticationDemo/UI/RegisterUI.uxml.meta b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/UI/RegisterUI.uxml.meta
similarity index 100%
rename from Assets/Samples/AuthenticationDemo/UI/RegisterUI.uxml.meta
rename to Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/UI/RegisterUI.uxml.meta
diff --git a/Assets/Samples/AuthenticationDemo/UI/VerifyUI.uxml b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/UI/VerifyUI.uxml
similarity index 100%
rename from Assets/Samples/AuthenticationDemo/UI/VerifyUI.uxml
rename to Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/UI/VerifyUI.uxml
diff --git a/Assets/Samples/AuthenticationDemo/UI/VerifyUI.uxml.meta b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/UI/VerifyUI.uxml.meta
similarity index 100%
rename from Assets/Samples/AuthenticationDemo/UI/VerifyUI.uxml.meta
rename to Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/UI/VerifyUI.uxml.meta
diff --git a/Assets/Samples/ChatDemo.meta b/Assets/Talo Game Services/Talo/Samples/ChatDemo.meta
similarity index 100%
rename from Assets/Samples/ChatDemo.meta
rename to Assets/Talo Game Services/Talo/Samples/ChatDemo.meta
diff --git a/Assets/Samples/ChatDemo/Scenes.meta b/Assets/Talo Game Services/Talo/Samples/ChatDemo/Scenes.meta
similarity index 100%
rename from Assets/Samples/ChatDemo/Scenes.meta
rename to Assets/Talo Game Services/Talo/Samples/ChatDemo/Scenes.meta
diff --git a/Assets/Samples/ChatDemo/Scenes/ChatDemo.unity b/Assets/Talo Game Services/Talo/Samples/ChatDemo/Scenes/ChatDemo.unity
similarity index 100%
rename from Assets/Samples/ChatDemo/Scenes/ChatDemo.unity
rename to Assets/Talo Game Services/Talo/Samples/ChatDemo/Scenes/ChatDemo.unity
diff --git a/Assets/Samples/ChatDemo/Scenes/ChatDemo.unity.meta b/Assets/Talo Game Services/Talo/Samples/ChatDemo/Scenes/ChatDemo.unity.meta
similarity index 100%
rename from Assets/Samples/ChatDemo/Scenes/ChatDemo.unity.meta
rename to Assets/Talo Game Services/Talo/Samples/ChatDemo/Scenes/ChatDemo.unity.meta
diff --git a/Assets/Samples/ChatDemo/Scripts.meta b/Assets/Talo Game Services/Talo/Samples/ChatDemo/Scripts.meta
similarity index 100%
rename from Assets/Samples/ChatDemo/Scripts.meta
rename to Assets/Talo Game Services/Talo/Samples/ChatDemo/Scripts.meta
diff --git a/Assets/Talo Game Services/Talo/Samples/ChatDemo/Scripts/ChatUIController.cs b/Assets/Talo Game Services/Talo/Samples/ChatDemo/Scripts/ChatUIController.cs
new file mode 100644
index 0000000..9d1b6d3
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Samples/ChatDemo/Scripts/ChatUIController.cs	
@@ -0,0 +1,165 @@
+using UnityEngine;
+using UnityEngine.UIElements;
+using System.Collections.Generic;
+
+namespace TaloGameServices.Sample.ChatDemo
+{
+    public class ChatUIController : MonoBehaviour
+    {
+        public string playerUsername;
+        private int activeChannelId;
+
+        private List<string> messages = new List<string>();
+        private VisualElement root;
+        private ListView messagesList;
+        private VisualElement channelsList;
+        private TextField messageField;
+        private Button sendButton;
+        private TextField channelNameField;
+        private Button createButton;
+
+        private async void Start()
+        {
+            root = GetComponent<UIDocument>().rootVisualElement;
+
+            InitMessagesList();
+            messageField = root.Q<TextField>("message");
+            sendButton = root.Q<Button>("post-btn");
+            sendButton.clicked += OnSendClick;
+
+            Talo.Channels.OnMessageReceived += OnMessageReceived;
+            Talo.PlayerPresence.OnPresenceChanged += OnPresenceChanged;
+
+            if (string.IsNullOrEmpty(playerUsername))
+            {
+                AddMessage("[SYSTEM] No player username set, please set one in the UI game object");
+                return;
+            }
+
+            await Talo.Players.Identify("username", playerUsername);
+            AddMessage("[SYSTEM] Identified as " + playerUsername);
+
+            InitChannelsList();
+
+            channelNameField = root.Q<TextField>("channel-name");
+            createButton = root.Q<Button>("create-btn");
+            createButton.clicked += OnCreateChannelClick;
+        }
+
+        private void InitMessagesList()
+        {
+            messagesList = root.Q<ListView>("list");
+
+            messagesList.makeItem = () =>
+            {
+                var label = new Label();
+                label.style.color = new StyleColor(Color.white);
+                label.style.fontSize = 22;
+
+                return label;
+            };
+
+            messagesList.bindItem = (e, i) =>
+            {
+                e.Q<Label>().text = messages[i];
+            };
+
+            messagesList.itemsSource = messages;
+        }
+
+        private void AddChannelToList(Channel channel)
+        {
+            var button = new Button();
+            button.text = channel.name;
+            button.style.fontSize = 16;
+            button.style.height = 20;
+            button.clicked += async () => {
+                await Talo.Channels.Join(channel.id);
+                activeChannelId = channel.id;
+                AddMessage("[SYSTEM] Switched to channel " + channel.name);
+            };
+            channelsList.Add(button);
+        }
+
+        private async void InitChannelsList()
+        {
+            var res = await Talo.Channels.GetChannels(0);
+
+            channelsList = root.Q<VisualElement>("channels");
+            foreach (var channel in res.channels)
+            {
+                AddChannelToList(channel);
+            }
+        }
+
+        private void OnSendClick()
+        {
+            if (Talo.CurrentPlayer == null)
+            {
+                AddMessage("[SYSTEM] No player username set, please set one in the UI game object");
+                return;
+            }
+
+            if (activeChannelId < 1)
+            {
+                AddMessage("[SYSTEM] No active channel set, please join a channel");
+                return;
+            }
+
+            var message = messageField.text;
+            if (string.IsNullOrEmpty(message))
+            {
+                AddMessage("[SYSTEM] Message cannot be empty");
+                return;
+            }
+
+            Talo.Channels.SendMessage(activeChannelId, message);
+            messageField.value = "";
+        }
+
+        private async void OnCreateChannelClick()
+        {
+            if (Talo.CurrentPlayer == null)
+            {
+                AddMessage("[SYSTEM] No player username set, please set one in the UI game object");
+                return;
+            }
+
+            var channelName = channelNameField.text;
+            if (string.IsNullOrEmpty(channelName))
+            {
+                AddMessage("[SYSTEM] Channel name cannot be empty");
+                return;
+            }
+
+            var channel = await Talo.Channels.Create(channelName);
+            AddChannelToList(channel);
+            channelNameField.value = "";
+            activeChannelId = channel.id;
+
+            AddMessage("[SYSTEM] Created and joined channel " + channel.name);
+        }
+
+        private void AddMessage(string message)
+        {
+            messages.Add(message);
+            messagesList.Rebuild();
+        }
+
+        private void OnMessageReceived(Channel channel, PlayerAlias playerAlias, string message)
+        {
+            if (channel.id == activeChannelId)
+            {
+                AddMessage($"[{channel.name}] {playerAlias.identifier}: {message}");
+            }
+        }
+
+        private void OnPresenceChanged(PlayerPresence presence, bool onlineChanged, bool customStatusChanged)
+        {
+            if (onlineChanged)
+            {
+                AddMessage($"[SYSTEM] {presence.playerAlias.identifier} is now {(presence.online ? "online" : "offline")}");
+            }
+        }
+    }
+}
diff --git a/Assets/Samples/ChatDemo/Scripts/ChatUIController.cs.meta b/Assets/Talo Game Services/Talo/Samples/ChatDemo/Scripts/ChatUIController.cs.meta
similarity index 100%
rename from Assets/Samples/ChatDemo/Scripts/ChatUIController.cs.meta
rename to Assets/Talo Game Services/Talo/Samples/ChatDemo/Scripts/ChatUIController.cs.meta
diff --git a/Assets/Samples/ChatDemo/Settings.meta b/Assets/Talo Game Services/Talo/Samples/ChatDemo/Settings.meta
similarity index 100%
rename from Assets/Samples/ChatDemo/Settings.meta
rename to Assets/Talo Game Services/Talo/Samples/ChatDemo/Settings.meta
diff --git a/Assets/Samples/ChatDemo/Settings/Panel Settings.asset b/Assets/Talo Game Services/Talo/Samples/ChatDemo/Settings/Panel Settings.asset
similarity index 100%
rename from Assets/Samples/ChatDemo/Settings/Panel Settings.asset
rename to Assets/Talo Game Services/Talo/Samples/ChatDemo/Settings/Panel Settings.asset
diff --git a/Assets/Samples/ChatDemo/Settings/Panel Settings.asset.meta b/Assets/Talo Game Services/Talo/Samples/ChatDemo/Settings/Panel Settings.asset.meta
similarity index 100%
rename from Assets/Samples/ChatDemo/Settings/Panel Settings.asset.meta
rename to Assets/Talo Game Services/Talo/Samples/ChatDemo/Settings/Panel Settings.asset.meta
diff --git a/Assets/Samples/ChatDemo/Settings/UnityDefaultRuntimeTheme.tss b/Assets/Talo Game Services/Talo/Samples/ChatDemo/Settings/UnityDefaultRuntimeTheme.tss
similarity index 100%
rename from Assets/Samples/ChatDemo/Settings/UnityDefaultRuntimeTheme.tss
rename to Assets/Talo Game Services/Talo/Samples/ChatDemo/Settings/UnityDefaultRuntimeTheme.tss
diff --git a/Assets/Samples/ChatDemo/Settings/UnityDefaultRuntimeTheme.tss.meta b/Assets/Talo Game Services/Talo/Samples/ChatDemo/Settings/UnityDefaultRuntimeTheme.tss.meta
similarity index 100%
rename from Assets/Samples/ChatDemo/Settings/UnityDefaultRuntimeTheme.tss.meta
rename to Assets/Talo Game Services/Talo/Samples/ChatDemo/Settings/UnityDefaultRuntimeTheme.tss.meta
diff --git a/Assets/Samples/ChatDemo/UI.meta b/Assets/Talo Game Services/Talo/Samples/ChatDemo/UI.meta
similarity index 100%
rename from Assets/Samples/ChatDemo/UI.meta
rename to Assets/Talo Game Services/Talo/Samples/ChatDemo/UI.meta
diff --git a/Assets/Samples/ChatDemo/UI/ChatUI.uss b/Assets/Talo Game Services/Talo/Samples/ChatDemo/UI/ChatUI.uss
similarity index 100%
rename from Assets/Samples/ChatDemo/UI/ChatUI.uss
rename to Assets/Talo Game Services/Talo/Samples/ChatDemo/UI/ChatUI.uss
diff --git a/Assets/Samples/ChatDemo/UI/ChatUI.uss.meta b/Assets/Talo Game Services/Talo/Samples/ChatDemo/UI/ChatUI.uss.meta
similarity index 100%
rename from Assets/Samples/ChatDemo/UI/ChatUI.uss.meta
rename to Assets/Talo Game Services/Talo/Samples/ChatDemo/UI/ChatUI.uss.meta
diff --git a/Assets/Samples/ChatDemo/UI/ChatUI.uxml b/Assets/Talo Game Services/Talo/Samples/ChatDemo/UI/ChatUI.uxml
similarity index 100%
rename from Assets/Samples/ChatDemo/UI/ChatUI.uxml
rename to Assets/Talo Game Services/Talo/Samples/ChatDemo/UI/ChatUI.uxml
diff --git a/Assets/Samples/ChatDemo/UI/ChatUI.uxml.meta b/Assets/Talo Game Services/Talo/Samples/ChatDemo/UI/ChatUI.uxml.meta
similarity index 100%
rename from Assets/Samples/ChatDemo/UI/ChatUI.uxml.meta
rename to Assets/Talo Game Services/Talo/Samples/ChatDemo/UI/ChatUI.uxml.meta
diff --git a/Assets/Samples/LeaderboardsDemo.meta b/Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo.meta
similarity index 100%
rename from Assets/Samples/LeaderboardsDemo.meta
rename to Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo.meta
diff --git a/Assets/Samples/LeaderboardsDemo/Scenes.meta b/Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/Scenes.meta
similarity index 100%
rename from Assets/Samples/LeaderboardsDemo/Scenes.meta
rename to Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/Scenes.meta
diff --git a/Assets/Samples/LeaderboardsDemo/Scenes/LeaderboardsDemo.unity b/Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/Scenes/LeaderboardsDemo.unity
similarity index 100%
rename from Assets/Samples/LeaderboardsDemo/Scenes/LeaderboardsDemo.unity
rename to Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/Scenes/LeaderboardsDemo.unity
diff --git a/Assets/Samples/LeaderboardsDemo/Scenes/LeaderboardsDemo.unity.meta b/Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/Scenes/LeaderboardsDemo.unity.meta
similarity index 100%
rename from Assets/Samples/LeaderboardsDemo/Scenes/LeaderboardsDemo.unity.meta
rename to Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/Scenes/LeaderboardsDemo.unity.meta
diff --git a/Assets/Samples/LeaderboardsDemo/Scripts.meta b/Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/Scripts.meta
similarity index 100%
rename from Assets/Samples/LeaderboardsDemo/Scripts.meta
rename to Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/Scripts.meta
diff --git a/Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/Scripts/LeaderboardUIController.cs b/Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/Scripts/LeaderboardUIController.cs
new file mode 100644
index 0000000..0f3b8c3
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/Scripts/LeaderboardUIController.cs	
@@ -0,0 +1,146 @@
+using UnityEngine;
+using UnityEngine.UIElements;
+using System.Threading.Tasks;
+using System;
+using System.Collections.Generic;
+
+namespace TaloGameServices.Sample.LeaderboardsDemo
+{
+    public class LeaderboardUIController : MonoBehaviour
+    {
+        public string leaderboardName;
+        public bool includeArchived;
+
+        private VisualElement root;
+        private ListView entriesList;
+        private Label infoLabel;
+
+        private int filterIdx;
+        private string filter = "All";
+
+        private async void Start()
+        {
+            root = GetComponent<UIDocument>().rootVisualElement;
+            root.Q<Button>("post-btn").clicked += OnPostClick;
+            root.Q<Button>("filter-btn").clicked += OnFilterClick;
+
+            entriesList = root.Q<ListView>();
+            infoLabel = root.Q<Label>("info");
+
+            if (string.IsNullOrEmpty(leaderboardName))
+            {
+                throw new Exception("Please create a leaderboard and set the leaderboard name to its internal name");
+            }
+
+            await LoadEntries();
+        }
+
+        private async void OnPostClick()
+        {
+            var username = root.Q<TextField>().text;
+            var score = UnityEngine.Random.Range(0, 100);
+            var team = UnityEngine.Random.Range(0, 2) == 0 ? "Blue" : "Red";
+
+            await Talo.Players.Identify("username", username);
+            (LeaderboardEntry entry, bool updated) = await Talo.Leaderboards.AddEntry(
+                leaderboardName,
+                score,
+                ("team", team)
+            );
+
+            infoLabel.text = $"You scored {score} for the {team} team.";
+            if (updated) infoLabel.text += " Your highscore was updated!";
+
+            entriesList.Rebuild();
+        }
+
+        private void HandleListVisibility()
+        {
+            if (Talo.Leaderboards.GetCachedEntries(leaderboardName).Count == 0)
+            {
+                infoLabel.text = "There are currently no entries";
+            }
+            else
+            {
+                infoLabel.text = "";
+            }
+        }
+
+        private async Task LoadEntries()
+        {
+            var page = 0;
+            var done = false;
+
+            do
+            {
+                try
+                {
+                    var res = await Talo.Leaderboards.GetEntries(leaderboardName, page, includeArchived: includeArchived);
+                    page++;
+                    done = res.isLastPage;
+                }
+                catch (RequestException e)
+                {
+                    if (e.responseCode == 404)
+                    {
+                        infoLabel.text = $"Failed loading leaderboard {leaderboardName}. Does it exist?";
+                    }
+                    else
+                    {
+                        infoLabel.text = e.Message;
+                        Debug.LogError(e);
+                    }
+                    return;
+                }
+
+            } while (!done);
+            
+            HandleListVisibility();
+
+            entriesList.makeItem = () =>
+            {
+                var label = new Label();
+                label.style.color = new StyleColor(Color.white);
+                label.style.fontSize = 22;
+
+                return label;
+            };
+
+            entriesList.bindItem = (e, i) =>
+            {
+                LeaderboardEntry entry = entriesList.itemsSource[i] as LeaderboardEntry;
+                var teamText = entry.GetProp("team", "No");
+                var archivedText = !string.IsNullOrEmpty(entry.deletedAt) ? " (archived)" : "";
+                e.Q<Label>().text = $"{i+1}. {entry.playerAlias.identifier} - {entry.score} ({teamText} team){archivedText}";
+            };
+
+            entriesList.itemsSource = Talo.Leaderboards.GetCachedEntries(leaderboardName);
+        }
+
+        private string GetNextFilter(int idx)
+        {
+            return new [] { "All", "Blue", "Red" } [idx % 3];
+        }
+
+        private void OnFilterClick()
+        {
+            filterIdx++;
+            filter = GetNextFilter(filterIdx);
+
+            infoLabel.text = $"Filtering on {filter.ToLower()}";
+            root.Q<Button>("filter-btn").text = $"{GetNextFilter(filterIdx + 1)} team scores";
+
+            if (filter == "All")
+            {
+                entriesList.itemsSource = Talo.Leaderboards.GetCachedEntries(leaderboardName);
+            }
+            else
+            {
+                entriesList.itemsSource = new List<LeaderboardEntry>(Talo.Leaderboards.GetCachedEntries(leaderboardName)
+                    .FindAll((e) => e.GetProp("team", "") == filter));
+            }
+
+            entriesList.Rebuild();
+        }
+    }
+}
diff --git a/Assets/Samples/LeaderboardsDemo/Scripts/LeaderboardUIController.cs.meta b/Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/Scripts/LeaderboardUIController.cs.meta
similarity index 100%
rename from Assets/Samples/LeaderboardsDemo/Scripts/LeaderboardUIController.cs.meta
rename to Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/Scripts/LeaderboardUIController.cs.meta
diff --git a/Assets/Samples/LeaderboardsDemo/Settings.meta b/Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/Settings.meta
similarity index 100%
rename from Assets/Samples/LeaderboardsDemo/Settings.meta
rename to Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/Settings.meta
diff --git a/Assets/Samples/LeaderboardsDemo/Settings/Panel Settings.asset b/Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/Settings/Panel Settings.asset
similarity index 100%
rename from Assets/Samples/LeaderboardsDemo/Settings/Panel Settings.asset
rename to Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/Settings/Panel Settings.asset
diff --git a/Assets/Samples/LeaderboardsDemo/Settings/Panel Settings.asset.meta b/Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/Settings/Panel Settings.asset.meta
similarity index 100%
rename from Assets/Samples/LeaderboardsDemo/Settings/Panel Settings.asset.meta
rename to Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/Settings/Panel Settings.asset.meta
diff --git a/Assets/Samples/LeaderboardsDemo/Settings/UnityDefaultRuntimeTheme.tss b/Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/Settings/UnityDefaultRuntimeTheme.tss
similarity index 100%
rename from Assets/Samples/LeaderboardsDemo/Settings/UnityDefaultRuntimeTheme.tss
rename to Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/Settings/UnityDefaultRuntimeTheme.tss
diff --git a/Assets/Samples/LeaderboardsDemo/Settings/UnityDefaultRuntimeTheme.tss.meta b/Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/Settings/UnityDefaultRuntimeTheme.tss.meta
similarity index 100%
rename from Assets/Samples/LeaderboardsDemo/Settings/UnityDefaultRuntimeTheme.tss.meta
rename to Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/Settings/UnityDefaultRuntimeTheme.tss.meta
diff --git a/Assets/Samples/LeaderboardsDemo/UI.meta b/Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/UI.meta
similarity index 100%
rename from Assets/Samples/LeaderboardsDemo/UI.meta
rename to Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/UI.meta
diff --git a/Assets/Samples/LeaderboardsDemo/UI/LeaderboardUI.uxml b/Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/UI/LeaderboardUI.uxml
similarity index 100%
rename from Assets/Samples/LeaderboardsDemo/UI/LeaderboardUI.uxml
rename to Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/UI/LeaderboardUI.uxml
diff --git a/Assets/Samples/LeaderboardsDemo/UI/LeaderboardUI.uxml.meta b/Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/UI/LeaderboardUI.uxml.meta
similarity index 100%
rename from Assets/Samples/LeaderboardsDemo/UI/LeaderboardUI.uxml.meta
rename to Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/UI/LeaderboardUI.uxml.meta
diff --git a/Assets/Samples/LeaderboardsDemo/UI/LeaderboardsUI.uss b/Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/UI/LeaderboardsUI.uss
similarity index 100%
rename from Assets/Samples/LeaderboardsDemo/UI/LeaderboardsUI.uss
rename to Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/UI/LeaderboardsUI.uss
diff --git a/Assets/Samples/LeaderboardsDemo/UI/LeaderboardsUI.uss.meta b/Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/UI/LeaderboardsUI.uss.meta
similarity index 100%
rename from Assets/Samples/LeaderboardsDemo/UI/LeaderboardsUI.uss.meta
rename to Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/UI/LeaderboardsUI.uss.meta
diff --git a/Assets/Samples/Playground.meta b/Assets/Talo Game Services/Talo/Samples/Playground.meta
similarity index 100%
rename from Assets/Samples/Playground.meta
rename to Assets/Talo Game Services/Talo/Samples/Playground.meta
diff --git a/Assets/Samples/Playground/Scenes.meta b/Assets/Talo Game Services/Talo/Samples/Playground/Scenes.meta
similarity index 100%
rename from Assets/Samples/Playground/Scenes.meta
rename to Assets/Talo Game Services/Talo/Samples/Playground/Scenes.meta
diff --git a/Assets/Samples/Playground/Scenes/Playground.unity b/Assets/Talo Game Services/Talo/Samples/Playground/Scenes/Playground.unity
similarity index 100%
rename from Assets/Samples/Playground/Scenes/Playground.unity
rename to Assets/Talo Game Services/Talo/Samples/Playground/Scenes/Playground.unity
diff --git a/Assets/Samples/Playground/Scenes/Playground.unity.meta b/Assets/Talo Game Services/Talo/Samples/Playground/Scenes/Playground.unity.meta
similarity index 74%
rename from Assets/Samples/Playground/Scenes/Playground.unity.meta
rename to Assets/Talo Game Services/Talo/Samples/Playground/Scenes/Playground.unity.meta
index c1e3c88..bae08b4 100644
--- a/Assets/Samples/Playground/Scenes/Playground.unity.meta
+++ b/Assets/Talo Game Services/Talo/Samples/Playground/Scenes/Playground.unity.meta	
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2cda990e2423bbf4892e6590ba056729
+guid: bf633de3533d4f8692f8a0d59ca4c31e
 DefaultImporter:
   externalObjects: {}
   userData: 
diff --git a/Assets/Samples/Playground/Scripts.meta b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts.meta
similarity index 100%
rename from Assets/Samples/Playground/Scripts.meta
rename to Assets/Talo Game Services/Talo/Samples/Playground/Scripts.meta
diff --git a/Assets/Samples/Playground/Scripts/Continuity.meta b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Continuity.meta
similarity index 100%
rename from Assets/Samples/Playground/Scripts/Continuity.meta
rename to Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Continuity.meta
diff --git a/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Continuity/ToggleContinuity.cs b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Continuity/ToggleContinuity.cs
new file mode 100644
index 0000000..a4150a1
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Continuity/ToggleContinuity.cs	
@@ -0,0 +1,31 @@
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace TaloGameServices.Sample.Playground
+{
+    public class ToggleContinuity : MonoBehaviour
+    {
+        private void Start()
+        {
+            SetText();
+        }
+
+        private bool GetValue()
+        {
+            return Talo.Settings.continuityEnabled;
+        }
+
+        private void SetText()
+        {
+            GetComponentInChildren<Text>().text = GetValue() ? "Toggle off" : "Toggle on";
+        }
+
+        public void OnButtonClick()
+        {
+            Talo.Settings.continuityEnabled = !Talo.Settings.continuityEnabled;
+            SetText();
+
+            ResponseMessage.SetText($"Continuity is now {(Talo.Settings.continuityEnabled ? "enabled" : "disabled")}");
+        }
+    }
+}
diff --git a/Assets/Samples/Playground/Scripts/Continuity/ToggleContinuity.cs.meta b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Continuity/ToggleContinuity.cs.meta
similarity index 100%
rename from Assets/Samples/Playground/Scripts/Continuity/ToggleContinuity.cs.meta
rename to Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Continuity/ToggleContinuity.cs.meta
diff --git a/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Continuity/ToggleOfflineMode.cs b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Continuity/ToggleOfflineMode.cs
new file mode 100644
index 0000000..60a52e3
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Continuity/ToggleOfflineMode.cs	
@@ -0,0 +1,31 @@
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace TaloGameServices.Sample.Playground
+{
+    public class ToggleOfflineMode : MonoBehaviour
+    {
+        private void Start()
+        {
+            SetText();
+        }
+
+        private bool GetValue()
+        {
+            return Talo.Settings.offlineMode;
+        }
+
+        private void SetText()
+        {
+            GetComponentInChildren<Text>().text = GetValue() ? "Go online" : "Go offline";
+        }
+
+        public void OnButtonClick()
+        {
+            Talo.Settings.offlineMode = !Talo.Settings.offlineMode;
+            SetText();
+
+            ResponseMessage.SetText($"You are now now {(Talo.Settings.offlineMode ? "offline" : "online")}");
+        }
+    }
+}
diff --git a/Assets/Samples/Playground/Scripts/Continuity/ToggleOfflineMode.cs.meta b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Continuity/ToggleOfflineMode.cs.meta
similarity index 100%
rename from Assets/Samples/Playground/Scripts/Continuity/ToggleOfflineMode.cs.meta
rename to Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Continuity/ToggleOfflineMode.cs.meta
diff --git a/Assets/Samples/Playground/Scripts/Events.meta b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Events.meta
similarity index 100%
rename from Assets/Samples/Playground/Scripts/Events.meta
rename to Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Events.meta
diff --git a/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Events/FlushEvents.cs b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Events/FlushEvents.cs
new file mode 100644
index 0000000..d2a7afd
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Events/FlushEvents.cs	
@@ -0,0 +1,29 @@
+using System;
+using UnityEngine;
+using System.Threading.Tasks;
+
+namespace TaloGameServices.Sample.Playground
+{
+    public class FlushEvents : MonoBehaviour
+    {
+        public async void OnButtonClick()
+        {
+            await Flush();
+        }
+
+        private async Task Flush()
+        {
+            try
+            {
+                await Talo.Events.Flush();
+
+                ResponseMessage.SetText("Flushed events");
+            }
+            catch (Exception err)
+            {
+                ResponseMessage.SetText(err.Message);
+                throw err;
+            }
+        }
+    }
+}
diff --git a/Assets/Samples/Playground/Scripts/Events/FlushEvents.cs.meta b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Events/FlushEvents.cs.meta
similarity index 100%
rename from Assets/Samples/Playground/Scripts/Events/FlushEvents.cs.meta
rename to Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Events/FlushEvents.cs.meta
diff --git a/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Events/TrackEvent.cs b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Events/TrackEvent.cs
new file mode 100644
index 0000000..0a96db4
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Events/TrackEvent.cs	
@@ -0,0 +1,47 @@
+using System;
+using UnityEngine;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace TaloGameServices.Sample.Playground
+{
+    public class TrackEvent : MonoBehaviour
+    {
+        public string eventName;
+        public Prop[] props;
+        public bool flushImmediately;
+
+        public async void OnButtonClick()
+        {
+            await Track();
+        }
+
+        private async Task Track()
+        {
+            if (string.IsNullOrEmpty(eventName))
+            {
+                ResponseMessage.SetText("eventName not set on TrackEventButton");
+                return;
+            }
+
+            try
+            {
+                await Talo.Events.Track(eventName, props.Select((prop) => (prop.key, prop.value)).ToArray());
+
+                ResponseMessage.SetText($"{eventName} tracked");
+
+                if (flushImmediately)
+                {
+                    await Talo.Events.Flush();
+
+                    ResponseMessage.SetText($"{eventName} tracked and events flushed");
+                }
+            }
+            catch (Exception err)
+            {
+                ResponseMessage.SetText(err.Message);
+                throw err;
+            }
+        }
+    }
+}
diff --git a/Assets/Samples/Playground/Scripts/Events/TrackEvent.cs.meta b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Events/TrackEvent.cs.meta
similarity index 100%
rename from Assets/Samples/Playground/Scripts/Events/TrackEvent.cs.meta
rename to Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Events/TrackEvent.cs.meta
diff --git a/Assets/Samples/Playground/Scripts/Feedback.meta b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Feedback.meta
similarity index 100%
rename from Assets/Samples/Playground/Scripts/Feedback.meta
rename to Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Feedback.meta
diff --git a/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Feedback/GetCategories.cs b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Feedback/GetCategories.cs
new file mode 100644
index 0000000..f4530e7
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Feedback/GetCategories.cs	
@@ -0,0 +1,30 @@
+using UnityEngine;
+using System.Threading.Tasks;
+using System.Linq;
+
+namespace TaloGameServices.Sample.Playground
+{
+
+    public class GetCategories : MonoBehaviour
+    {
+        public async void OnButtonClick()
+        {
+            await FetchCategories();
+        }
+
+        private async Task FetchCategories()
+        {
+            var categories = await Talo.Feedback.GetCategories();
+
+            if (categories.Length == 0)
+            {
+                ResponseMessage.SetText("No categories found. Create some in the Talo dashboard!");
+            }
+            else
+            {
+                var mapped = categories.Select((c) => $"{c.name} ({c.internalName})");
+                ResponseMessage.SetText($"Categories: " + string.Join(", ", mapped));
+            }
+        }
+    }
+}
diff --git a/Assets/Samples/Playground/Scripts/Feedback/GetCategories.cs.meta b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Feedback/GetCategories.cs.meta
similarity index 100%
rename from Assets/Samples/Playground/Scripts/Feedback/GetCategories.cs.meta
rename to Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Feedback/GetCategories.cs.meta
diff --git a/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Feedback/SendFeedback.cs b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Feedback/SendFeedback.cs
new file mode 100644
index 0000000..34c327b
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Feedback/SendFeedback.cs	
@@ -0,0 +1,30 @@
+using UnityEngine;
+using System;
+
+namespace TaloGameServices.Sample.Playground
+{
+    public class SendFeedback : MonoBehaviour
+    {
+        public string categoryInternalName, feedbackComment;
+
+        public async void OnButtonClick()
+        {
+            if (string.IsNullOrEmpty(categoryInternalName) || string.IsNullOrEmpty(feedbackComment))
+            {
+                ResponseMessage.SetText("categoryInternalName or feedbackComment not set on SendFeedbackButton");
+                return;
+            }
+
+            try
+            {
+                await Talo.Feedback.Send(categoryInternalName, feedbackComment);
+                ResponseMessage.SetText($"Feedback sent for {categoryInternalName}: {feedbackComment}");
+            }
+            catch (Exception err)
+            {
+                ResponseMessage.SetText(err.Message);
+                throw err;
+            }
+        }
+    }
+}
diff --git a/Assets/Samples/Playground/Scripts/Feedback/SendFeedback.cs.meta b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Feedback/SendFeedback.cs.meta
similarity index 100%
rename from Assets/Samples/Playground/Scripts/Feedback/SendFeedback.cs.meta
rename to Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Feedback/SendFeedback.cs.meta
diff --git a/Assets/Samples/Playground/Scripts/Leaderboards.meta b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Leaderboards.meta
similarity index 100%
rename from Assets/Samples/Playground/Scripts/Leaderboards.meta
rename to Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Leaderboards.meta
diff --git a/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Leaderboards/GetLeaderboardEntries.cs b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Leaderboards/GetLeaderboardEntries.cs
new file mode 100644
index 0000000..9f414bf
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Leaderboards/GetLeaderboardEntries.cs	
@@ -0,0 +1,48 @@
+using System;
+using UnityEngine;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace TaloGameServices.Sample.Playground
+{
+    public class GetLeaderboardEntries : MonoBehaviour
+    {
+        public string leaderboardInternalName;
+        public int page = 0;
+
+        public async void OnButtonClick()
+        {
+            await FetchEntries();
+        }
+
+        private async Task FetchEntries()
+        {
+            if (string.IsNullOrEmpty(leaderboardInternalName))
+            {
+                ResponseMessage.SetText("leaderboardInternalName not set on GetLeaderboardEntriesButton");
+                return;
+            }
+
+            try
+            {
+                int score = UnityEngine.Random.Range(0, 10000);
+                LeaderboardEntriesResponse res = await Talo.Leaderboards.GetEntries(leaderboardInternalName, page);
+                LeaderboardEntry[] entries = res.entries;
+
+                if (entries.Length == 0)
+                {
+                    ResponseMessage.SetText($"No entries for page {page}");
+                }
+                else
+                {
+                    ResponseMessage.SetText(string.Join(", ", entries.Select((e) => e.ToString()).ToArray()));
+                }
+            }
+            catch (Exception err)
+            {
+                ResponseMessage.SetText(err.Message);
+                throw err;
+            }
+        }
+    }
+}
diff --git a/Assets/Samples/Playground/Scripts/Leaderboards/GetLeaderboardEntries.cs.meta b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Leaderboards/GetLeaderboardEntries.cs.meta
similarity index 100%
rename from Assets/Samples/Playground/Scripts/Leaderboards/GetLeaderboardEntries.cs.meta
rename to Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Leaderboards/GetLeaderboardEntries.cs.meta
diff --git a/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Leaderboards/PostLeaderboardEntry.cs b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Leaderboards/PostLeaderboardEntry.cs
new file mode 100644
index 0000000..771dda1
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Leaderboards/PostLeaderboardEntry.cs	
@@ -0,0 +1,38 @@
+using System;
+using System.Threading.Tasks;
+using UnityEngine;
+
+namespace TaloGameServices.Sample.Playground
+{
+    public class PostLeaderboardEntry : MonoBehaviour
+    {
+        public string leaderboardInternalName;
+
+        public async void OnButtonClick()
+        {
+            await PostEntry();
+        }
+
+        private async Task PostEntry()
+        {
+            if (string.IsNullOrEmpty(leaderboardInternalName))
+            {
+                ResponseMessage.SetText("leaderboardInternalName not set on AddEntryButton");
+                return;
+            }
+
+            try
+            {
+                int score = UnityEngine.Random.Range(0, 10000);
+                (LeaderboardEntry entry, bool updated) = await Talo.Leaderboards.AddEntry(leaderboardInternalName, score);
+
+                ResponseMessage.SetText($"Entry with score {score} added, position is {entry.position}, it was {(updated ? "" : "not")} updated");
+            }
+            catch (Exception err)
+            {
+                ResponseMessage.SetText(err.Message);
+                throw err;
+            }
+        }
+    }
+}
diff --git a/Assets/Samples/Playground/Scripts/Leaderboards/PostLeaderboardEntry.cs.meta b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Leaderboards/PostLeaderboardEntry.cs.meta
similarity index 100%
rename from Assets/Samples/Playground/Scripts/Leaderboards/PostLeaderboardEntry.cs.meta
rename to Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Leaderboards/PostLeaderboardEntry.cs.meta
diff --git a/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/OpenDocs.cs b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/OpenDocs.cs
new file mode 100644
index 0000000..7e23d20
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/OpenDocs.cs	
@@ -0,0 +1,12 @@
+using UnityEngine;
+
+namespace TaloGameServices.Sample.Playground
+{
+    public class OpenDocs : MonoBehaviour
+    {
+        public void OnButtonClick()
+        {
+            Application.OpenURL("https://docs.trytalo.com/docs/unity/install?utm_source=unity-playground");
+        }
+    }
+}
diff --git a/Assets/Samples/Playground/Scripts/OpenDocs.cs.meta b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/OpenDocs.cs.meta
similarity index 100%
rename from Assets/Samples/Playground/Scripts/OpenDocs.cs.meta
rename to Assets/Talo Game Services/Talo/Samples/Playground/Scripts/OpenDocs.cs.meta
diff --git a/Assets/Samples/Playground/Scripts/Players.meta b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Players.meta
similarity index 100%
rename from Assets/Samples/Playground/Scripts/Players.meta
rename to Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Players.meta
diff --git a/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Players/DeleteProp.cs b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Players/DeleteProp.cs
new file mode 100644
index 0000000..1c8a306
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Players/DeleteProp.cs	
@@ -0,0 +1,36 @@
+using UnityEngine;
+using System.Threading.Tasks;
+using System;
+
+namespace TaloGameServices.Sample.Playground
+{
+    public class DeleteHealthProp : MonoBehaviour
+    {
+        public string key;
+
+        public async void OnButtonClick()
+        {
+            await DeleteProp();
+        }
+
+        private async Task DeleteProp()
+        {
+            if (string.IsNullOrEmpty(key))
+            {
+                ResponseMessage.SetText("key not set on DeletePropButton");
+                return;
+            }
+
+            try
+            {
+                await Talo.CurrentPlayer.DeleteProp(key);
+                ResponseMessage.SetText($"{key} deleted");
+            }
+            catch (Exception err)
+            {
+                ResponseMessage.SetText(err.Message);
+                throw err;
+            }
+        }
+    }
+}
diff --git a/Assets/Samples/Playground/Scripts/Players/DeleteProp.cs.meta b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Players/DeleteProp.cs.meta
similarity index 100%
rename from Assets/Samples/Playground/Scripts/Players/DeleteProp.cs.meta
rename to Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Players/DeleteProp.cs.meta
diff --git a/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Players/GetGroup.cs b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Players/GetGroup.cs
new file mode 100644
index 0000000..7a509fb
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Players/GetGroup.cs	
@@ -0,0 +1,29 @@
+using System;
+using UnityEngine;
+
+namespace TaloGameServices.Sample.Playground
+{
+    public class GetGroup : MonoBehaviour
+    {
+        public string groupId;
+
+        public async void OnButtonClick()
+        {
+            if (string.IsNullOrEmpty(groupId))
+            {
+                ResponseMessage.SetText("groupId not set on GetGroupButton");
+                return;
+            }
+
+            try
+            {
+                var group = await Talo.PlayerGroups.Get(groupId);
+                ResponseMessage.SetText($"{group.name} has {group.count} player(s)");
+            }
+            catch (Exception e)
+            {
+                ResponseMessage.SetText(e.Message);
+            }
+        }
+    }
+}
diff --git a/Assets/Samples/Playground/Scripts/Players/GetGroup.cs.meta b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Players/GetGroup.cs.meta
similarity index 100%
rename from Assets/Samples/Playground/Scripts/Players/GetGroup.cs.meta
rename to Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Players/GetGroup.cs.meta
diff --git a/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Players/IdentifyPlayer.cs b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Players/IdentifyPlayer.cs
new file mode 100644
index 0000000..091a78c
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Players/IdentifyPlayer.cs	
@@ -0,0 +1,51 @@
+using System;
+using UnityEngine;
+using UnityEngine.UI;
+using System.Threading.Tasks;
+
+namespace TaloGameServices.Sample.Playground
+{
+    public class IdentifyPlayer : MonoBehaviour
+    {
+        public string service, identifier;
+
+        private void Start()
+        {
+            Talo.Players.OnIdentified += OnIdentified;
+        }
+
+        public async void OnButtonClick()
+        {
+            await Identify();
+        }
+
+        private async Task Identify()
+        {
+            if (string.IsNullOrEmpty(service) || string.IsNullOrEmpty(identifier))
+            {
+                ResponseMessage.SetText("service or identifier not set on IdentifyButton");
+                return;
+            }
+
+            try
+            {
+                await Talo.Players.Identify(service, identifier);
+            }
+            catch (Exception err)
+            {
+                ResponseMessage.SetText(err.Message);
+                throw err;
+            }
+        }
+
+        private void OnIdentified(Player player)
+        {
+            var panel = GameObject.Find("APIs");
+            if (panel != null)
+            {
+                ResponseMessage.SetText("Identified!");
+                panel.GetComponent<Image>().color = new Color(120 / 255f, 230 / 255f, 160 / 255f);
+            }
+        }
+    }
+}
diff --git a/Assets/Samples/Playground/Scripts/Players/IdentifyPlayer.cs.meta b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Players/IdentifyPlayer.cs.meta
similarity index 100%
rename from Assets/Samples/Playground/Scripts/Players/IdentifyPlayer.cs.meta
rename to Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Players/IdentifyPlayer.cs.meta
diff --git a/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Players/SetProp.cs b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Players/SetProp.cs
new file mode 100644
index 0000000..8eb435b
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Players/SetProp.cs	
@@ -0,0 +1,35 @@
+using UnityEngine;
+using System.Threading.Tasks;
+
+namespace TaloGameServices.Sample.Playground
+{
+    public class SetProp : MonoBehaviour
+    {
+        public string key, value;
+
+        public async void OnButtonClick()
+        {
+            await UpdateProp();
+        }
+
+        private async Task UpdateProp()
+        {
+            if (string.IsNullOrEmpty(key) || string.IsNullOrEmpty(value))
+            {
+                ResponseMessage.SetText("key or value not set on SetPropButton");
+                return;
+            }
+
+            try
+            {
+                await Talo.CurrentPlayer.SetProp(key, value);
+                ResponseMessage.SetText($"{key} set to {value}");
+            }
+            catch (System.Exception err)
+            {
+                ResponseMessage.SetText(err.Message);
+                throw err;
+            }
+        }
+    }
+}
diff --git a/Assets/Samples/Playground/Scripts/Players/SetProp.cs.meta b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Players/SetProp.cs.meta
similarity index 100%
rename from Assets/Samples/Playground/Scripts/Players/SetProp.cs.meta
rename to Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Players/SetProp.cs.meta
diff --git a/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/ResponseMessage.cs b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/ResponseMessage.cs
new file mode 100644
index 0000000..1053211
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/ResponseMessage.cs	
@@ -0,0 +1,14 @@
+using System;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace TaloGameServices.Sample.Playground
+{
+    public class ResponseMessage : MonoBehaviour
+    {
+        public static void SetText(string text)
+        {
+            GameObject.Find("Response Message").GetComponent<Text>().text = $"{DateTime.Now.TimeOfDay}: {text}";
+        }
+    }
+}
diff --git a/Assets/Samples/Playground/Scripts/ResponseMessage.cs.meta b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/ResponseMessage.cs.meta
similarity index 100%
rename from Assets/Samples/Playground/Scripts/ResponseMessage.cs.meta
rename to Assets/Talo Game Services/Talo/Samples/Playground/Scripts/ResponseMessage.cs.meta
diff --git a/Assets/Samples/Playground/Scripts/Stats.meta b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Stats.meta
similarity index 100%
rename from Assets/Samples/Playground/Scripts/Stats.meta
rename to Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Stats.meta
diff --git a/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Stats/GetAllStats.cs b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Stats/GetAllStats.cs
new file mode 100644
index 0000000..46d2f98
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Stats/GetAllStats.cs	
@@ -0,0 +1,29 @@
+using System;
+using System.Linq;
+using UnityEngine;
+
+namespace TaloGameServices.Sample.Playground
+{
+    public class GetAllStats : MonoBehaviour
+    {
+        public void OnButtonClick()
+        {
+            FetchStats();
+        }
+
+        private async void FetchStats()
+        {
+            try
+            {
+                var res = await Talo.Stats.GetStats();
+                var internalNames = res.Length > 0 ? string.Join(", ", res.Select((item) => item.internalName)) : "no stats";
+                ResponseMessage.SetText($"Stats: {internalNames}");
+            }
+            catch (Exception err)
+            {
+                ResponseMessage.SetText(err.Message);
+                throw err;
+            }
+        }
+    }
+}
diff --git a/Assets/Samples/Playground/Scripts/Stats/GetAllStats.cs.meta b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Stats/GetAllStats.cs.meta
similarity index 100%
rename from Assets/Samples/Playground/Scripts/Stats/GetAllStats.cs.meta
rename to Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Stats/GetAllStats.cs.meta
diff --git a/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Stats/GetGlobalHistory.cs b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Stats/GetGlobalHistory.cs
new file mode 100644
index 0000000..40272c8
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Stats/GetGlobalHistory.cs	
@@ -0,0 +1,45 @@
+using System;
+using UnityEngine;
+
+namespace TaloGameServices.Sample.Playground
+{
+    public class GetGlobalHistory : MonoBehaviour
+    {
+        public string statInternalName;
+
+        public void OnButtonClick()
+        {
+            FetchGlobalHistory();
+        }
+
+        private async void FetchGlobalHistory()
+        {
+            if (string.IsNullOrEmpty(statInternalName))
+            {
+                ResponseMessage.SetText("statInternalName not set on GetGlobalHistoryButton");
+                return;
+            }
+
+            try
+            {
+                var res = await Talo.Stats.GetGlobalHistory(statInternalName);
+                var globalMetrics = res.globalValue;
+                var playerMetrics = res.playerValue;
+
+                ResponseMessage.SetText(
+                    $"Min: {globalMetrics.minValue}, " +
+                    $"max: {globalMetrics.maxValue}, " +
+                    $"median: {globalMetrics.medianValue}, " +
+                    $"average: {globalMetrics.averageValue}, " +
+                    $"average change: {globalMetrics.averageChange}, " +
+                    $"average player value: {playerMetrics.averageValue}"
+                );
+            }
+            catch (Exception err)
+            {
+                ResponseMessage.SetText(err.Message);
+                throw err;
+            }
+        }
+    }
+}
diff --git a/Assets/Samples/Playground/Scripts/Stats/GetGlobalHistory.cs.meta b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Stats/GetGlobalHistory.cs.meta
similarity index 100%
rename from Assets/Samples/Playground/Scripts/Stats/GetGlobalHistory.cs.meta
rename to Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Stats/GetGlobalHistory.cs.meta
diff --git a/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Stats/GetStat.cs b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Stats/GetStat.cs
new file mode 100644
index 0000000..93f1083
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Stats/GetStat.cs	
@@ -0,0 +1,35 @@
+using System;
+using UnityEngine;
+
+namespace TaloGameServices.Sample.Playground
+{
+    public class GetStat : MonoBehaviour
+    {
+        public string statInternalName;
+
+        public void OnButtonClick()
+        {
+            FetchStat();
+        }
+
+        private async void FetchStat()
+        {
+            if (string.IsNullOrEmpty(statInternalName))
+            {
+                ResponseMessage.SetText("statInternalName not set on GetStatButton");
+                return;
+            }
+
+            try
+            {
+                var res = await Talo.Stats.GetStat(statInternalName);
+                ResponseMessage.SetText($"{res.name} is{(res.global ? "" : " not")} a global stat, with a default value of {res.defaultValue}");
+            }
+            catch (Exception err)
+            {
+                ResponseMessage.SetText(err.Message);
+                throw err;
+            }
+        }
+    }
+}
diff --git a/Assets/Samples/Playground/Scripts/Stats/GetStat.cs.meta b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Stats/GetStat.cs.meta
similarity index 100%
rename from Assets/Samples/Playground/Scripts/Stats/GetStat.cs.meta
rename to Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Stats/GetStat.cs.meta
diff --git a/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Stats/GetStatHistory.cs b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Stats/GetStatHistory.cs
new file mode 100644
index 0000000..87e3942
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Stats/GetStatHistory.cs	
@@ -0,0 +1,38 @@
+using System;
+using UnityEngine;
+using System.Linq;
+
+namespace TaloGameServices.Sample.Playground
+{
+    public class GetStatHistory : MonoBehaviour
+    {
+        public string statInternalName;
+
+        public void OnButtonClick()
+        {
+            FetchHistory();
+        }
+
+        private async void FetchHistory()
+        {
+            if (string.IsNullOrEmpty(statInternalName))
+            {
+                ResponseMessage.SetText("statInternalName not set on GetStatHistoryButton");
+                return;
+            }
+
+            try
+            {
+                var res = await Talo.Stats.GetHistory(statInternalName);
+                var changeString = res.count > 0 ? string.Join(", ", res.history.Select((item) => item.change)) : "no changes";
+
+                ResponseMessage.SetText($"{statInternalName} changed by: {changeString}");
+            }
+            catch (Exception err)
+            {
+                ResponseMessage.SetText(err.Message);
+                throw err;
+            }
+        }
+    }
+}
diff --git a/Assets/Samples/Playground/Scripts/Stats/GetStatHistory.cs.meta b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Stats/GetStatHistory.cs.meta
similarity index 100%
rename from Assets/Samples/Playground/Scripts/Stats/GetStatHistory.cs.meta
rename to Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Stats/GetStatHistory.cs.meta
diff --git a/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Stats/TrackStat.cs b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Stats/TrackStat.cs
new file mode 100644
index 0000000..8df0d38
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Stats/TrackStat.cs	
@@ -0,0 +1,37 @@
+using System;
+using UnityEngine;
+
+namespace TaloGameServices.Sample.Playground
+{
+    public class TrackStat : MonoBehaviour
+    {
+        public string statInternalName;
+        public float change = 1;
+
+        public void OnButtonClick()
+        {
+            Track();
+        }
+
+        private async void Track()
+        {
+            if (string.IsNullOrEmpty(statInternalName))
+            {
+                ResponseMessage.SetText("statInternalName not set on TrackStatButton");
+                return;
+            }
+
+            try
+            {
+                var res = await Talo.Stats.Track(statInternalName, change);
+
+                ResponseMessage.SetText($"{statInternalName} changed by {change}, new value is {res.playerStat.value}");
+            }
+            catch (Exception err)
+            {
+                ResponseMessage.SetText(err.Message);
+                throw err;
+            }
+        }
+    }
+}
diff --git a/Assets/Samples/Playground/Scripts/Stats/TrackStat.cs.meta b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Stats/TrackStat.cs.meta
similarity index 100%
rename from Assets/Samples/Playground/Scripts/Stats/TrackStat.cs.meta
rename to Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Stats/TrackStat.cs.meta
diff --git a/Assets/Samples/SavesDemo.meta b/Assets/Talo Game Services/Talo/Samples/SavesDemo.meta
similarity index 100%
rename from Assets/Samples/SavesDemo.meta
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo.meta
diff --git a/Assets/Samples/SavesDemo/Materials.meta b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Materials.meta
similarity index 100%
rename from Assets/Samples/SavesDemo/Materials.meta
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/Materials.meta
diff --git a/Assets/Samples/SavesDemo/Materials/Cube.mat b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Materials/Cube.mat
similarity index 100%
rename from Assets/Samples/SavesDemo/Materials/Cube.mat
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/Materials/Cube.mat
diff --git a/Assets/Samples/SavesDemo/Materials/Cube.mat.meta b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Materials/Cube.mat.meta
similarity index 100%
rename from Assets/Samples/SavesDemo/Materials/Cube.mat.meta
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/Materials/Cube.mat.meta
diff --git a/Assets/Samples/SavesDemo/Scenes.meta b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Scenes.meta
similarity index 100%
rename from Assets/Samples/SavesDemo/Scenes.meta
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/Scenes.meta
diff --git a/Assets/Samples/SavesDemo/Scenes/SavesDemo.unity b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Scenes/SavesDemo.unity
similarity index 100%
rename from Assets/Samples/SavesDemo/Scenes/SavesDemo.unity
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/Scenes/SavesDemo.unity
diff --git a/Assets/Samples/SavesDemo/Scenes/SavesDemo.unity.meta b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Scenes/SavesDemo.unity.meta
similarity index 100%
rename from Assets/Samples/SavesDemo/Scenes/SavesDemo.unity.meta
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/Scenes/SavesDemo.unity.meta
diff --git a/Assets/Samples/SavesDemo/Scripts.meta b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts.meta
similarity index 100%
rename from Assets/Samples/SavesDemo/Scripts.meta
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts.meta
diff --git a/Assets/Samples/SavesDemo/Scripts/GameUIController.cs b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/GameUIController.cs
similarity index 96%
rename from Assets/Samples/SavesDemo/Scripts/GameUIController.cs
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/GameUIController.cs
index 18c8f59..aadf7b5 100644
--- a/Assets/Samples/SavesDemo/Scripts/GameUIController.cs
+++ b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/GameUIController.cs	
@@ -1,8 +1,7 @@
 using UnityEngine;
-using TaloGameServices;
 using UnityEngine.UIElements;
 
-namespace TaloSavesDemo
+namespace TaloGameServices.Sample.SavesDemo
 {
     public class GameUIController : MonoBehaviour
     {
diff --git a/Assets/Samples/SavesDemo/Scripts/GameUIController.cs.meta b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/GameUIController.cs.meta
similarity index 100%
rename from Assets/Samples/SavesDemo/Scripts/GameUIController.cs.meta
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/GameUIController.cs.meta
diff --git a/Assets/Samples/SavesDemo/Scripts/GlobalUIController.cs b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/GlobalUIController.cs
similarity index 98%
rename from Assets/Samples/SavesDemo/Scripts/GlobalUIController.cs
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/GlobalUIController.cs
index 0e62a5d..cb1e58c 100644
--- a/Assets/Samples/SavesDemo/Scripts/GlobalUIController.cs
+++ b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/GlobalUIController.cs	
@@ -1,8 +1,7 @@
 using UnityEngine;
 using UnityEngine.UIElements;
-using TaloGameServices;
 
-namespace TaloSavesDemo
+namespace TaloGameServices.Sample.SavesDemo
 {
     public class GlobalUIController : MonoBehaviour
     {
diff --git a/Assets/Samples/SavesDemo/Scripts/GlobalUIController.cs.meta b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/GlobalUIController.cs.meta
similarity index 100%
rename from Assets/Samples/SavesDemo/Scripts/GlobalUIController.cs.meta
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/GlobalUIController.cs.meta
diff --git a/Assets/Samples/SavesDemo/Scripts/LoadableCube.cs b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/LoadableCube.cs
similarity index 95%
rename from Assets/Samples/SavesDemo/Scripts/LoadableCube.cs
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/LoadableCube.cs
index 0aa400e..b9f33bd 100644
--- a/Assets/Samples/SavesDemo/Scripts/LoadableCube.cs
+++ b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/LoadableCube.cs	
@@ -1,8 +1,7 @@
 using System.Collections.Generic;
 using UnityEngine;
-using TaloGameServices;
 
-namespace TaloSavesDemo
+namespace TaloGameServices.Sample.SavesDemo
 {
     public class LoadableCube : Loadable
     {
diff --git a/Assets/Samples/SavesDemo/Scripts/LoadableCube.cs.meta b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/LoadableCube.cs.meta
similarity index 100%
rename from Assets/Samples/SavesDemo/Scripts/LoadableCube.cs.meta
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/LoadableCube.cs.meta
diff --git a/Assets/Samples/SavesDemo/Scripts/LoginUIController.cs b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/LoginUIController.cs
similarity index 91%
rename from Assets/Samples/SavesDemo/Scripts/LoginUIController.cs
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/LoginUIController.cs
index 20a6701..419a142 100644
--- a/Assets/Samples/SavesDemo/Scripts/LoginUIController.cs
+++ b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/LoginUIController.cs	
@@ -1,8 +1,7 @@
 using UnityEngine;
-using TaloGameServices;
 using UnityEngine.UIElements;
 
-namespace TaloSavesDemo
+namespace TaloGameServices.Sample.SavesDemo
 {
     public class LoginUIController : MonoBehaviour
     {
diff --git a/Assets/Samples/SavesDemo/Scripts/LoginUIController.cs.meta b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/LoginUIController.cs.meta
similarity index 100%
rename from Assets/Samples/SavesDemo/Scripts/LoginUIController.cs.meta
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/LoginUIController.cs.meta
diff --git a/Assets/Samples/SavesDemo/Scripts/MenuUIController.cs b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/MenuUIController.cs
similarity index 97%
rename from Assets/Samples/SavesDemo/Scripts/MenuUIController.cs
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/MenuUIController.cs
index bfcd430..0d5d4aa 100644
--- a/Assets/Samples/SavesDemo/Scripts/MenuUIController.cs
+++ b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/MenuUIController.cs	
@@ -1,9 +1,8 @@
 using UnityEngine;
-using TaloGameServices;
 using UnityEngine.UIElements;
 using System;
 
-namespace TaloSavesDemo
+namespace TaloGameServices.Sample.SavesDemo
 {
     public class MenuUIController : MonoBehaviour
     {
diff --git a/Assets/Samples/SavesDemo/Scripts/MenuUIController.cs.meta b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/MenuUIController.cs.meta
similarity index 100%
rename from Assets/Samples/SavesDemo/Scripts/MenuUIController.cs.meta
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/MenuUIController.cs.meta
diff --git a/Assets/Samples/SavesDemo/Scripts/SavesListUIController.cs b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/SavesListUIController.cs
similarity index 98%
rename from Assets/Samples/SavesDemo/Scripts/SavesListUIController.cs
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/SavesListUIController.cs
index 71c77e5..fa9d87d 100644
--- a/Assets/Samples/SavesDemo/Scripts/SavesListUIController.cs
+++ b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/SavesListUIController.cs	
@@ -1,9 +1,8 @@
 using UnityEngine;
-using TaloGameServices;
 using UnityEngine.UIElements;
 using System.Collections.Generic;
 
-namespace TaloSavesDemo
+namespace TaloGameServices.Sample.SavesDemo
 {
     public class SavesListUIController : MonoBehaviour
     {
diff --git a/Assets/Samples/SavesDemo/Scripts/SavesListUIController.cs.meta b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/SavesListUIController.cs.meta
similarity index 100%
rename from Assets/Samples/SavesDemo/Scripts/SavesListUIController.cs.meta
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/SavesListUIController.cs.meta
diff --git a/Assets/Samples/SavesDemo/Settings.meta b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Settings.meta
similarity index 100%
rename from Assets/Samples/SavesDemo/Settings.meta
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/Settings.meta
diff --git a/Assets/Samples/SavesDemo/Settings/Panel Settings.asset b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Settings/Panel Settings.asset
similarity index 100%
rename from Assets/Samples/SavesDemo/Settings/Panel Settings.asset
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/Settings/Panel Settings.asset
diff --git a/Assets/Samples/SavesDemo/Settings/Panel Settings.asset.meta b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Settings/Panel Settings.asset.meta
similarity index 100%
rename from Assets/Samples/SavesDemo/Settings/Panel Settings.asset.meta
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/Settings/Panel Settings.asset.meta
diff --git a/Assets/Samples/SavesDemo/Settings/UnityDefaultRuntimeTheme.tss b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Settings/UnityDefaultRuntimeTheme.tss
similarity index 100%
rename from Assets/Samples/SavesDemo/Settings/UnityDefaultRuntimeTheme.tss
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/Settings/UnityDefaultRuntimeTheme.tss
diff --git a/Assets/Samples/SavesDemo/Settings/UnityDefaultRuntimeTheme.tss.meta b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Settings/UnityDefaultRuntimeTheme.tss.meta
similarity index 100%
rename from Assets/Samples/SavesDemo/Settings/UnityDefaultRuntimeTheme.tss.meta
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/Settings/UnityDefaultRuntimeTheme.tss.meta
diff --git a/Assets/Samples/SavesDemo/Textures.meta b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Textures.meta
similarity index 100%
rename from Assets/Samples/SavesDemo/Textures.meta
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/Textures.meta
diff --git a/Assets/Samples/SavesDemo/Textures/Cube.png b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Textures/Cube.png
similarity index 100%
rename from Assets/Samples/SavesDemo/Textures/Cube.png
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/Textures/Cube.png
diff --git a/Assets/Samples/SavesDemo/Textures/Cube.png.meta b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Textures/Cube.png.meta
similarity index 76%
rename from Assets/Samples/SavesDemo/Textures/Cube.png.meta
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/Textures/Cube.png.meta
index b1adb61..dee7bf3 100644
--- a/Assets/Samples/SavesDemo/Textures/Cube.png.meta
+++ b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Textures/Cube.png.meta	
@@ -3,7 +3,7 @@ guid: faf3af3e2ec6319499922425867c95c5
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -62,8 +64,10 @@ TextureImporter:
   textureFormatSet: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -73,12 +77,27 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
+    customData: 
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
@@ -88,9 +107,11 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
-  spritePackingTag: 
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/Assets/Samples/SavesDemo/UI.meta b/Assets/Talo Game Services/Talo/Samples/SavesDemo/UI.meta
similarity index 100%
rename from Assets/Samples/SavesDemo/UI.meta
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/UI.meta
diff --git a/Assets/Samples/SavesDemo/UI/ClickableSave.uxml b/Assets/Talo Game Services/Talo/Samples/SavesDemo/UI/ClickableSave.uxml
similarity index 100%
rename from Assets/Samples/SavesDemo/UI/ClickableSave.uxml
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/UI/ClickableSave.uxml
diff --git a/Assets/Samples/SavesDemo/UI/ClickableSave.uxml.meta b/Assets/Talo Game Services/Talo/Samples/SavesDemo/UI/ClickableSave.uxml.meta
similarity index 100%
rename from Assets/Samples/SavesDemo/UI/ClickableSave.uxml.meta
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/UI/ClickableSave.uxml.meta
diff --git a/Assets/Samples/SavesDemo/UI/GameUI.uxml b/Assets/Talo Game Services/Talo/Samples/SavesDemo/UI/GameUI.uxml
similarity index 100%
rename from Assets/Samples/SavesDemo/UI/GameUI.uxml
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/UI/GameUI.uxml
diff --git a/Assets/Samples/SavesDemo/UI/GameUI.uxml.meta b/Assets/Talo Game Services/Talo/Samples/SavesDemo/UI/GameUI.uxml.meta
similarity index 100%
rename from Assets/Samples/SavesDemo/UI/GameUI.uxml.meta
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/UI/GameUI.uxml.meta
diff --git a/Assets/Samples/SavesDemo/UI/LoginUI.uxml b/Assets/Talo Game Services/Talo/Samples/SavesDemo/UI/LoginUI.uxml
similarity index 100%
rename from Assets/Samples/SavesDemo/UI/LoginUI.uxml
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/UI/LoginUI.uxml
diff --git a/Assets/Samples/SavesDemo/UI/LoginUI.uxml.meta b/Assets/Talo Game Services/Talo/Samples/SavesDemo/UI/LoginUI.uxml.meta
similarity index 100%
rename from Assets/Samples/SavesDemo/UI/LoginUI.uxml.meta
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/UI/LoginUI.uxml.meta
diff --git a/Assets/Samples/SavesDemo/UI/MenuUI.uxml b/Assets/Talo Game Services/Talo/Samples/SavesDemo/UI/MenuUI.uxml
similarity index 100%
rename from Assets/Samples/SavesDemo/UI/MenuUI.uxml
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/UI/MenuUI.uxml
diff --git a/Assets/Samples/SavesDemo/UI/MenuUI.uxml.meta b/Assets/Talo Game Services/Talo/Samples/SavesDemo/UI/MenuUI.uxml.meta
similarity index 100%
rename from Assets/Samples/SavesDemo/UI/MenuUI.uxml.meta
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/UI/MenuUI.uxml.meta
diff --git a/Assets/Samples/SavesDemo/UI/SavesListUI.uxml b/Assets/Talo Game Services/Talo/Samples/SavesDemo/UI/SavesListUI.uxml
similarity index 100%
rename from Assets/Samples/SavesDemo/UI/SavesListUI.uxml
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/UI/SavesListUI.uxml
diff --git a/Assets/Samples/SavesDemo/UI/SavesListUI.uxml.meta b/Assets/Talo Game Services/Talo/Samples/SavesDemo/UI/SavesListUI.uxml.meta
similarity index 100%
rename from Assets/Samples/SavesDemo/UI/SavesListUI.uxml.meta
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/UI/SavesListUI.uxml.meta
diff --git a/Assets/Samples/SavesDemo/UI/SavesUI.uss b/Assets/Talo Game Services/Talo/Samples/SavesDemo/UI/SavesUI.uss
similarity index 100%
rename from Assets/Samples/SavesDemo/UI/SavesUI.uss
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/UI/SavesUI.uss
diff --git a/Assets/Samples/SavesDemo/UI/SavesUI.uss.meta b/Assets/Talo Game Services/Talo/Samples/SavesDemo/UI/SavesUI.uss.meta
similarity index 100%
rename from Assets/Samples/SavesDemo/UI/SavesUI.uss.meta
rename to Assets/Talo Game Services/Talo/Samples/SavesDemo/UI/SavesUI.uss.meta
diff --git a/Packages/com.trytalo.talo/Tests.meta b/Assets/Talo Game Services/Talo/Tests.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Tests.meta
rename to Assets/Talo Game Services/Talo/Tests.meta
diff --git a/Packages/com.trytalo.talo/Tests/Runtime/LiveConfig.meta b/Assets/Talo Game Services/Talo/Tests/LiveConfig.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Tests/Runtime/LiveConfig.meta
rename to Assets/Talo Game Services/Talo/Tests/LiveConfig.meta
diff --git a/Packages/com.trytalo.talo/Tests/Runtime/LiveConfig/GetPropTest.cs b/Assets/Talo Game Services/Talo/Tests/LiveConfig/GetPropTest.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Tests/Runtime/LiveConfig/GetPropTest.cs
rename to Assets/Talo Game Services/Talo/Tests/LiveConfig/GetPropTest.cs
diff --git a/Packages/com.trytalo.talo/Tests/Runtime/LiveConfig/GetPropTest.cs.meta b/Assets/Talo Game Services/Talo/Tests/LiveConfig/GetPropTest.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Tests/Runtime/LiveConfig/GetPropTest.cs.meta
rename to Assets/Talo Game Services/Talo/Tests/LiveConfig/GetPropTest.cs.meta
diff --git a/Packages/com.trytalo.talo/Tests/Runtime/SavesAPI.meta b/Assets/Talo Game Services/Talo/Tests/SavesAPI.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Tests/Runtime/SavesAPI.meta
rename to Assets/Talo Game Services/Talo/Tests/SavesAPI.meta
diff --git a/Packages/com.trytalo.talo/Tests/Runtime/SavesAPI/ChooseSaveTest.cs b/Assets/Talo Game Services/Talo/Tests/SavesAPI/ChooseSaveTest.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Tests/Runtime/SavesAPI/ChooseSaveTest.cs
rename to Assets/Talo Game Services/Talo/Tests/SavesAPI/ChooseSaveTest.cs
diff --git a/Packages/com.trytalo.talo/Tests/Runtime/SavesAPI/ChooseSaveTest.cs.meta b/Assets/Talo Game Services/Talo/Tests/SavesAPI/ChooseSaveTest.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Tests/Runtime/SavesAPI/ChooseSaveTest.cs.meta
rename to Assets/Talo Game Services/Talo/Tests/SavesAPI/ChooseSaveTest.cs.meta
diff --git a/Packages/com.trytalo.talo/Tests/Runtime/SavesAPI/CreateSaveTest.cs b/Assets/Talo Game Services/Talo/Tests/SavesAPI/CreateSaveTest.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Tests/Runtime/SavesAPI/CreateSaveTest.cs
rename to Assets/Talo Game Services/Talo/Tests/SavesAPI/CreateSaveTest.cs
diff --git a/Packages/com.trytalo.talo/Tests/Runtime/SavesAPI/CreateSaveTest.cs.meta b/Assets/Talo Game Services/Talo/Tests/SavesAPI/CreateSaveTest.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Tests/Runtime/SavesAPI/CreateSaveTest.cs.meta
rename to Assets/Talo Game Services/Talo/Tests/SavesAPI/CreateSaveTest.cs.meta
diff --git a/Packages/com.trytalo.talo/Tests/Runtime/SavesAPI/DeleteSaveTest.cs b/Assets/Talo Game Services/Talo/Tests/SavesAPI/DeleteSaveTest.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Tests/Runtime/SavesAPI/DeleteSaveTest.cs
rename to Assets/Talo Game Services/Talo/Tests/SavesAPI/DeleteSaveTest.cs
diff --git a/Packages/com.trytalo.talo/Tests/Runtime/SavesAPI/DeleteSaveTest.cs.meta b/Assets/Talo Game Services/Talo/Tests/SavesAPI/DeleteSaveTest.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Tests/Runtime/SavesAPI/DeleteSaveTest.cs.meta
rename to Assets/Talo Game Services/Talo/Tests/SavesAPI/DeleteSaveTest.cs.meta
diff --git a/Packages/com.trytalo.talo/Tests/Runtime/SavesAPI/GetSavesTest.cs b/Assets/Talo Game Services/Talo/Tests/SavesAPI/GetSavesTest.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Tests/Runtime/SavesAPI/GetSavesTest.cs
rename to Assets/Talo Game Services/Talo/Tests/SavesAPI/GetSavesTest.cs
diff --git a/Packages/com.trytalo.talo/Tests/Runtime/SavesAPI/GetSavesTest.cs.meta b/Assets/Talo Game Services/Talo/Tests/SavesAPI/GetSavesTest.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Tests/Runtime/SavesAPI/GetSavesTest.cs.meta
rename to Assets/Talo Game Services/Talo/Tests/SavesAPI/GetSavesTest.cs.meta
diff --git a/Packages/com.trytalo.talo/Tests/Runtime/SavesAPI/SaveContentTest.cs b/Assets/Talo Game Services/Talo/Tests/SavesAPI/SaveContentTest.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Tests/Runtime/SavesAPI/SaveContentTest.cs
rename to Assets/Talo Game Services/Talo/Tests/SavesAPI/SaveContentTest.cs
diff --git a/Packages/com.trytalo.talo/Tests/Runtime/SavesAPI/SaveContentTest.cs.meta b/Assets/Talo Game Services/Talo/Tests/SavesAPI/SaveContentTest.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Tests/Runtime/SavesAPI/SaveContentTest.cs.meta
rename to Assets/Talo Game Services/Talo/Tests/SavesAPI/SaveContentTest.cs.meta
diff --git a/Packages/com.trytalo.talo/Tests/Runtime/SavesAPI/UpdateSaveTest.cs b/Assets/Talo Game Services/Talo/Tests/SavesAPI/UpdateSaveTest.cs
similarity index 100%
rename from Packages/com.trytalo.talo/Tests/Runtime/SavesAPI/UpdateSaveTest.cs
rename to Assets/Talo Game Services/Talo/Tests/SavesAPI/UpdateSaveTest.cs
diff --git a/Packages/com.trytalo.talo/Tests/Runtime/SavesAPI/UpdateSaveTest.cs.meta b/Assets/Talo Game Services/Talo/Tests/SavesAPI/UpdateSaveTest.cs.meta
similarity index 100%
rename from Packages/com.trytalo.talo/Tests/Runtime/SavesAPI/UpdateSaveTest.cs.meta
rename to Assets/Talo Game Services/Talo/Tests/SavesAPI/UpdateSaveTest.cs.meta
diff --git a/Packages/com.trytalo.talo/Tests/Runtime/Talo.GameServices.RuntimeTests.asmdef b/Assets/Talo Game Services/Talo/Tests/TaloTests.asmdef
similarity index 69%
rename from Packages/com.trytalo.talo/Tests/Runtime/Talo.GameServices.RuntimeTests.asmdef
rename to Assets/Talo Game Services/Talo/Tests/TaloTests.asmdef
index 20d20b1..9d3de42 100644
--- a/Packages/com.trytalo.talo/Tests/Runtime/Talo.GameServices.RuntimeTests.asmdef
+++ b/Assets/Talo Game Services/Talo/Tests/TaloTests.asmdef	
@@ -1,10 +1,10 @@
 {
-    "name": "Talo.GameServices.RuntimeTests",
+    "name": "Talo.Tests",
     "rootNamespace": "",
     "references": [
-        "UnityEngine.TestRunner",
-        "UnityEditor.TestRunner",
-        "Talo.GameServices.Runtime"
+        "GUID:27619889b8ba8c24980f49ee34dbb44a",
+        "GUID:0acc523941302664db1f4e527237feb3",
+        "GUID:acc2e053631d04b5db0e9a4fe61784ff"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/Packages/com.trytalo.talo/Runtime/Talo.GameServices.Runtime.asmdef.meta b/Assets/Talo Game Services/Talo/Tests/TaloTests.asmdef.meta
similarity index 76%
rename from Packages/com.trytalo.talo/Runtime/Talo.GameServices.Runtime.asmdef.meta
rename to Assets/Talo Game Services/Talo/Tests/TaloTests.asmdef.meta
index ee3e2ae..7b0391c 100644
--- a/Packages/com.trytalo.talo/Runtime/Talo.GameServices.Runtime.asmdef.meta
+++ b/Assets/Talo Game Services/Talo/Tests/TaloTests.asmdef.meta	
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0a371fa0e10d95f41a8f6750b1c365ed
+guid: 5544aca6e967d4df798d0628ea2a5dec
 AssemblyDefinitionImporter:
   externalObjects: {}
   userData: 
diff --git a/Packages/com.trytalo.talo/Runtime/AssemblyInfo.cs b/Packages/com.trytalo.talo/Runtime/AssemblyInfo.cs
deleted file mode 100644
index 685f7ad..0000000
--- a/Packages/com.trytalo.talo/Runtime/AssemblyInfo.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-using System.Runtime.CompilerServices;
-
-[assembly: InternalsVisibleTo("Talo.GameServices.RuntimeTests")]
diff --git a/Packages/com.trytalo.talo/Runtime/AssemblyInfo.cs.meta b/Packages/com.trytalo.talo/Runtime/AssemblyInfo.cs.meta
deleted file mode 100644
index 7e7f04e..0000000
--- a/Packages/com.trytalo.talo/Runtime/AssemblyInfo.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 7fe3d54cd4d48486594f1a56e9f268df
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Packages/com.trytalo.talo/Runtime/SocketRequests/SocketRequest.cs b/Packages/com.trytalo.talo/Runtime/SocketRequests/SocketRequest.cs
deleted file mode 100644
index 0765d91..0000000
--- a/Packages/com.trytalo.talo/Runtime/SocketRequests/SocketRequest.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-[System.Serializable]
-public class SocketRequest<T>
-{
-    public string req;
-
-    public T data;
-
-    public SocketRequest(string requestType, T requestData) 
-    {
-        req = requestType;
-        data = requestData;
-    }
-}
diff --git a/Packages/com.trytalo.talo/Runtime/SocketResponses/SocketResponse.cs b/Packages/com.trytalo.talo/Runtime/SocketResponses/SocketResponse.cs
deleted file mode 100644
index 0fa8823..0000000
--- a/Packages/com.trytalo.talo/Runtime/SocketResponses/SocketResponse.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using UnityEngine;
-
-[System.Serializable]
-public class SocketResponse
-{
-    private class SocketMessage<T>
-    {
-        public string res;
-        public T data;
-    }
-
-    public string message;
-
-    public SocketResponse(string message) 
-    {
-        this.message = message;
-    }
-
-    public string GetResponseType()
-    {
-        var message = JsonUtility.FromJson<SocketMessage<object>>(this.message);
-        return message.res;
-    }
-
-    public T GetData<T>()
-    {
-        return JsonUtility.FromJson<SocketMessage<T>>(message).data;
-    }
-}
diff --git a/Packages/com.trytalo.talo/package.json b/Packages/com.trytalo.talo/package.json
deleted file mode 100644
index 00915fb..0000000
--- a/Packages/com.trytalo.talo/package.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "name": "com.trytalo.talo",
-  "version": "0.37.1",
-  "displayName": "Talo Game Services",
-  "description": "Talo (https://trytalo.com) is an open-source game backend with services designed to help you build games faster. You can currently:\n\n- Identify and authenticate players\n- Store persistent data across players\n- Track events (levelling up, finding loot, etc)\n- Display high scores with leaderboards\n- Store and load player saves\n- Load game config options and flags from the cloud\n- Get feedback directly from your players\n- Send channel messages between players\n- See if players are online and set custom statuses",
-  "unity": "6000.0",
-  "keywords": [],
-  "author": {
-    "name": "Talo",
-    "email": "help@trytalo.com",
-    "url": "https://trytalo.com"
-  },
-  "type": "library",
-  "samples": [
-    {
-      "displayName": "Playground",
-      "description": "A simple UI-based playground, allowing you to test identifying, events, stats and leaderboards",
-      "path": "Samples~/Playground"
-    },
-    {
-      "displayName": "Saves Demo",
-      "description": "A basic saves UI, allowing you to load, create and update saves",
-      "path": "Samples~/SavesDemo"
-    },
-    {
-      "displayName": "Leaderboards Demo",
-      "description": "A minimal leaderboard UI, allowing you to add and update entries",
-      "path": "Samples~/LeaderboardsDemo"
-    },
-    {
-      "displayName": "Authentication Demo",
-      "description": "A register/login/verify flow, showing how to create and authenticate player accounts",
-      "path": "Samples~/AuthenticationDemo"
-    },
-    {
-      "displayName": "Chat Demo",
-      "description": "A simple chat UI, allowing you to create channels, join channels and send messages",
-      "path": "Samples~/ChatDemo"
-    }
-  ],
-  "changelogUrl": "https://github.com/TaloDev/unity/releases",
-  "documentationUrl": "https://docs.trytalo.com",
-  "dependencies": {
-    "com.unity.test-framework": "1.3.0",
-    "com.mikeschweitzer.websocket": "3.0.1"
-  }
-}
diff --git a/Packages/com.unity.asset-store-tools/CHANGELOG.md b/Packages/com.unity.asset-store-tools/CHANGELOG.md
new file mode 100644
index 0000000..c6cffa4
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/CHANGELOG.md
@@ -0,0 +1,324 @@
+# Changelog
+All notable changes to this package will be documented in this file.
+
+## [12.0.1] - 2025-01-16
+
+### Preview Generator changes
+- Updated generated preview collection UI to display the asset extension
+- Fixed an issue with some prefab and model asset types not generating previews
+- Fixed an error that could occur when changing scenes after deleting a preview source asset
+
+## [12.0.0] - 2025-01-13
+
+### General changes
+- The code comprising the Asset Store Publishing Tools has been refactored.
+- Added dependency on Newtonsoft Json
+
+### Uploader changes
+- Updated window to retain its state if closed unless a domain reload occurs
+- Added option to generate higher resolution asset previews when exporting
+- Fixed a rare issue where authentication would fail
+- Minor UI tweaks
+
+### Validator changes
+- Added validation tests for:
+    - Package naming
+	- Project Template assets
+- Updated the Type Namespace validation test to check for Unity top level namespaces
+
+### Exporter changes
+- Updated how asset previews are generated/included for the  package that is being exported
+
+### Preview Generator
+- Added a Preview Generator window that can be used to pre-generate and inspect package previews before exporting
+
+## [11.4.4] - 2024-11-29
+
+### Validator Changes
+- The validator UI window description section can now be expanded or shrunk to take up less screen space
+- Updated severity of the Model Importer Logs validation test
+
+### Exporter Changes
+- Updated exporter to always exclude hidden files and folders beginning with the dot symbol (e.g.: .hiddenFolder/ or .hiddenfile.txt)
+- Updated exporter to explicitly exclude extended attribute files when exporting packages on macOS systems
+
+### Other
+- Moved the Asset Store Tools toolbar items into the Tools section
+- Fixed several window-related compilation warnings when using Unity 6 versions of the Editor
+
+## [11.4.3] - 2024-08-01
+
+### Validator Changes
+- Hotfix: Remove non-ascii characters from the demo scene validation
+
+## [11.4.2] - 2024-07-30
+
+### Validator Changes
+- Check for nested .unitypackage files in the demo scene validation
+- Prevent normal map test from erroring when misc importer types are detected
+- Remove Templates category from the uncompressed images requirement list
+
+## [11.4.1] - 2024-05-10
+
+### Exporter Changes
+- Fixed an issue with bundled plugin folder contents not being exported
+
+### Other
+- Miscellaneous internal changes
+
+## [11.4.0] - 2024-01-23
+
+### Uploader Changes
+- Added prevention of uploading packages larger than 6 GB
+- Added a prompt to allow automatically generating meta files within hidden folders
+- Fixed some obsolete API usage warnings in newer Unity versions
+
+### Validator Changes
+- Added validation tests for:
+    - Animation Clip take names
+	- Model import logs
+	- Uncompressed Package size
+- Updated the fail severity of Audio Clipping validation test
+- Updated the Demo Scene test to treat default scenes with custom skyboxes as valid demo scenes
+- Fixed some obsolete API usage warnings in newer Unity versions
+
+### Other
+- Added an option to check for Asset Store Publishing Tools updates
+
+## [11.3.1] - 2023-08-14
+
+### Uploader Changes
+- Added the option to select indirect package dependencies from the project (e.g. Mathematics package installed by the Burst package)
+
+### Validator Changes
+- Updated the Texture Dimensions test to ignore 'Sprite' and 'Editor GUI' texture types
+
+### Exporter Changes
+- Updated exporter to ignore the 'ProjectSettings/ProjectVersion.txt' asset when exporting 'Complete Project' category packages
+
+## [11.3.0] - 2023-07-04
+
+### Uploader Changes
+
+- Added the option to validate a pre-exported package
+- Added the option to export a .unitypackage file without uploading
+- Updated the dependency selection UI
+
+### Validator Changes
+
+- Added the option to validate several asset paths at once
+    - Note: when validating package that is comprised of several folders (e.g. Assets/MyPackage + 
+	Assets/StreamingAssets + Assets/WebGLTemplates), please select all applicable paths that would be included in the package
+- Added several new validation tests for:
+    - File Menu Names
+	- Compressed files 
+	- Model Types
+	- Texture Dimensions
+	- Particle Systems
+	- Normal Map Textures
+    - Audio Clipping
+    - Path Lengths
+    - Script Compilation	
+- Updated validation test severities based on package category
+- Updated validation tests to each have their own test logic class
+- Updated validation tests to be displayed in alphabetical order
+- Fixed several issues with the namespace check test
+- Fixed scenes in Samples~ folders not being taken into account for the sample scene check test
+- Other internal changes
+
+### Exporter Changes
+
+- Package exporter is now a separate module (similar to Uploader and Validator)
+- Fixed hidden folders being included when exporting package content
+    - Note: this prevents an issue with the Unity Editor, where exported hidden folders would appear in the Project window 
+	as empty folders when imported, despite having content on disk. Content nested within hidden folders is still collected, 
+	provided it contains unique .meta files
+
+## [11.2.2] - 2023-02-23
+
+### Validator Changes
+
+- Updated the 'LOD Setup' test to address some issues
+	- Added additional checks for LOD renderers (inactive renderer check, LOD Group reference check, relative hierarchy position to LOD Group check)
+	- LOD Group Component is no longer required to be on the root of the Prefab
+	- Updated the test result message interface when invalid Prefabs are found
+
+## [11.2.1] - 2023-01-17
+
+### Uploader Changes
+
+- Added a more informative error when exporting content with clashing guid meta files in hidden folders
+- Fixed a compilation issue for Unity 2020.1 and 2020.2
+- Fixed a rare error condition when queueing multiple package uploads in quick succession
+- Fixed Asset Store Uploader state not being properly reset if the uploading process fails
+
+### Validator Changes
+
+- Updated the Asset Store Validator description
+- Fixed a rare memory overflow issue when performing package validation
+
+## [11.2.0] - 2022-11-03
+
+### Uploader Changes
+
+- Uploader will now use the custom package exporter by default
+    - An option to use the legacy (native) exporter can be found in the Asset Store Publishing Tools' settings window
+- When exporting from the Assets folder, package dependencies can now be selected individually instead of being a choice between 'All' or 'None'
+    - This option is only available with the custom exporter
+- Changed the way the Uploader reports completed uploading tasks
+    - Modal pop-up has been replaced by a new UI view state
+	- Added an option to the Asset Store Publishing Tools' Settings to display the pop-up after a completed upload
+- Changed exported .unitypackage files to have distinguishable file names
+- Fixed the Uploader window indefinitely stalling at 100% upload progress when a response from the Asset Store server is not received
+- Fixed native package exporter producing broken packages when the export path contained hidden folders
+- Fixed an issue with high CPU usage when uploading packages
+- Fixed Asset Store Publishing Tools' settings not being saved between Editor sessions on macOS
+- Other minor changes and tweaks
+
+### Validator Changes
+
+- Added two new tests:
+    - 'Types have namespaces': checks whether scripts and native libraries under the validated path are nested under a namespace
+	- 'Consistent line endings': checks whether scripts under the validated path have consistent line endings. This is similar to the warning from the Unity Editor compilation pipeline when a script contains both Windows and UNIX line endings.
+- Improved 'Reset Prefabs' test to display and be more informative about prefabs with unusually low transform values
+- Improved 'SpeedTree asset inclusion' test to search for '.st' files
+- Improved 'Documentation inclusion' test to treat '.md' files as valid documentation files
+- Improved 'Lossy audio file inclusion' test to treat '.aif' and '.aiff' files as valid non-lossy audio files
+- Improved 'Lossy audio file inclusion' test to search the project for non-lossy variants of existing lossy audio files
+- Removed 'Duplicate animation names' test
+- Tweaked validation severities for several tests
+- Other minor changes and tweaks
+
+## [11.1.0] - 2022-09-14
+
+### Uploader Changes
+
+- Package Publisher Portal links can now be opened for all packages regardless of package status
+- External Dependency Manager can now be selected as a 'Special Folder' if found in the root Assets folder
+
+### Validator Changes
+
+- Added category selection for the Validator
+    - Categories help determine the outcome of package validation more accurately. For example, documentation is not crucial for art packages, but is required for tooling packages.
+- Added a list of prefabs with missing mesh references to 'Meshes have Prefabs' test when the test fails
+- Corrected the message for a passing 'Shader compilation errors' test
+- Improved the floating point precision accuracy of 'Reset Prefabs' test
+- Fixed 'Missing Components in Assets' test checking all project folders instead of only the set path
+- Fixed 'Prefabs for meshes' test not checking meshes in certain paths
+- Fixed 'Reset Prefabs' test failing because of Prefabs with a Rect Transform Component
+- Fixed 'Reset Prefabs' test ignoring Transform rotation
+- Fixed test description text overlapping in some cases
+- Other minor changes and tweaks
+
+## [11.0.2] - 2022-08-09
+
+- Corrected some namespaces which were causing issues when deriving classes from Editor class
+
+## [11.0.1] - 2022-08-05
+
+### Uploader Changes
+
+- Added Settings window (Asset Store Tools > Settings)
+- Added Soft/Junction Symlink support (enable through Settings)
+- Added workflow and path selection serialization (workflow saved locally, paths locally and online)
+- No more logs when using the `-nullable` compiler option (thanks @alfish)
+- Some API refactoring in preparation for CLI support
+- Other minor fixes/improvements
+
+**Note:** when updating Asset Store Tools from the Package Manager, don't forget to remove the old version from the project (V11.0.0) before importing the new one (V11.0.1)
+
+
+## [11.0.0] - 2022-07-20
+
+### Uploader changes
+
+- UI has been reworked using UI Toolkit
+- New login window, allowing to login using Unity Cloud Services
+- Improved top bar, including search and sorting
+- Draft packages moved to the top
+- Added category, size, and last modified date next to the package
+- Added a link to the publishing portal next to the package
+- New uploading flow: “Pre-exported .unitypackage”
+- Previous uploading flow (folder selection) has been renamed to “From Assets Folder”
+- Dependencies check has been renamed to “Include Package Manifest” for clarity
+- Special Folders can now be selected and uploaded together with the package’s main folder (i.e. StreamingAssets, Plugins)
+- You can now upload to multiple packages at the same time without waiting for the first one to finish
+- Package can now be validated in the Uploading window by pressing the “Validate” button
+- Added refresh and logout buttons to the bottom toolbar for easier access
+- Packages caching - package information will no longer be redownloaded every time you open the Uploader window during the same Editor session
+- (Experimental) Custom exporter - will export your package ~2 times faster, but may miss some asset previews in the final product. To enable it - click three dots on the top left side of the window and enable “Use Custom Exporting”
+
+
+### Validator changes
+
+- UI has been reworked using UI Toolkit
+- New tests based on the new guidelines
+- Updated tests’ titles, descriptions, and error reporting
+
+## [5.0.5] - 2021-11-04
+
+- Fixed namespace issues
+
+## [5.0.4] - 2020-07-28
+
+- Fixed issues with Unity 2020.1
+
+## [5.0.3] - 2020-05-07
+
+- Remove "Remove Standard Assets" check
+
+## [5.0.2] - 2020-04-21 
+
+- Enable auto login with Unity account
+- Upload package with thread
+
+## [5.0.1] - 2020-03-23
+
+- Fix domain resolve issue
+
+## [5.0.0] - 2019-10-09
+
+- Added "Package Validator" tool
+- Added Help window
+- Added logout confirmation popup
+- Updated toolbar menu layout
+- Removed "Mass Labeler" tool
+- Updated layout of Login and Package Upload windows
+- Error messages are now more elaborate and user-friendly
+- Removed deprecated "Main Assets" step from the Package Upload window
+- Package Upload window now has a step for including package manager dependencies
+- Tooltips are now added to each upload process step
+
+
+## [4.1.0] - 2018-05-14
+
+- Made Tool compatible with 2017.1
+
+## [4.0.7] - 2017-07-10
+
+- Tweaked menu items.
+
+## [4.0.6] - 2016-07-15
+
+- Improved error messages.
+
+## [4.0.5] - 2016-03-17
+
+- Enabling upload of fbm files.
+
+## [4.0.4] - 2015-11-16
+
+- Login improvements
+
+## [4.0.3] - 2015-11-16
+
+- Prepare the Tools for Unity 5.3
+
+## [4.0.2] - 2015-10-23
+
+- Fixed issue where Upload button would not work for some projects.
+- Fixed issues for publishers that only had one package.
+
+## [4.0.0] - 2015-09-01
+
+- Replaced Package Manager with Package Upload. Package management is now handled by Publisher Administration
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/CHANGELOG.md.meta b/Packages/com.unity.asset-store-tools/CHANGELOG.md.meta
new file mode 100644
index 0000000..9ca86c3
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/CHANGELOG.md.meta
@@ -0,0 +1,14 @@
+fileFormatVersion: 2
+guid: 06607220dbd46414e8f66bf9c5e3eb79
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/CHANGELOG.md
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor.meta b/Packages/com.unity.asset-store-tools/Editor.meta
new file mode 100644
index 0000000..8521ad6
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 166da5c6fc70e814a8262463903b2714
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api.meta b/Packages/com.unity.asset-store-tools/Editor/Api.meta
new file mode 100644
index 0000000..0cf8e3f
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d48a2325d352e7a4cae56d3f8eeaab2d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions.meta b/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions.meta
new file mode 100644
index 0000000..80ccfb1
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 25799fb31cd475347af7f5442c231797
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/AuthenticationBase.cs b/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/AuthenticationBase.cs
new file mode 100644
index 0000000..e74b5ff
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/AuthenticationBase.cs
@@ -0,0 +1,48 @@
+using AssetStoreTools.Api.Responses;
+using AssetStoreTools.Utility;
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using UnityEngine;
+
+namespace AssetStoreTools.Api
+{
+    internal abstract class AuthenticationBase : IAuthenticationType
+    {
+        protected Uri LoginUrl = ApiUtility.CreateUri(Constants.Api.AuthenticateUrl, true);
+        protected FormUrlEncodedContent AuthenticationContent;
+
+        protected FormUrlEncodedContent GetAuthenticationContent(params KeyValuePair<string, string>[] content)
+        {
+            var baseContent = Constants.Api.DefaultAssetStoreQuery();
+
+            try { baseContent.Add("license_hash", ApiUtility.GetLicenseHash()); } catch { ASDebug.LogWarning("Could not retrieve license hash"); }
+            try { baseContent.Add("hardware_hash", ApiUtility.GetHardwareHash()); } catch { ASDebug.LogWarning("Could not retrieve hardware hash"); }
+
+            foreach (var extraContent in content)
+            {
+                baseContent.Add(extraContent.Key, extraContent.Value);
+            }
+
+            return new FormUrlEncodedContent(baseContent);
+        }
+
+        protected AuthenticationResponse ParseResponse(HttpResponseMessage response)
+        {
+            try
+            {
+                response.EnsureSuccessStatusCode();
+                var responseString = response.Content.ReadAsStringAsync().Result;
+                return new AuthenticationResponse(responseString);
+            }
+            catch (HttpRequestException e)
+            {
+                return new AuthenticationResponse(response.StatusCode, e) { Success = false };
+            }
+        }
+
+        public abstract Task<AuthenticationResponse> Authenticate(IAssetStoreClient client, CancellationToken cancellationToken = default);
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/AuthenticationBase.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/AuthenticationBase.cs.meta
new file mode 100644
index 0000000..2607489
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/AuthenticationBase.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: f677e03f1be1048439a1fa5e7a0a37b6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/AuthenticationBase.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/IAssetStoreApi.cs b/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/IAssetStoreApi.cs
new file mode 100644
index 0000000..9daeaf5
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/IAssetStoreApi.cs
@@ -0,0 +1,21 @@
+using AssetStoreTools.Api.Models;
+using AssetStoreTools.Api.Responses;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace AssetStoreTools.Api
+{
+    internal interface IAssetStoreApi
+    {
+        Task<AssetStoreToolsVersionResponse> GetLatestAssetStoreToolsVersion(CancellationToken cancellationToken = default);
+        Task<AuthenticationResponse> Authenticate(IAuthenticationType authenticationType, CancellationToken cancellationToken = default);
+        void Deauthenticate();
+        Task<PackagesDataResponse> GetPackages(CancellationToken cancellationToken = default);
+        Task<CategoryDataResponse> GetCategories(CancellationToken cancellationToken = default);
+        Task<PackageThumbnailResponse> GetPackageThumbnail(Package package, CancellationToken cancellationToken = default);
+        Task<RefreshedPackageDataResponse> RefreshPackageMetadata(Package package, CancellationToken cancellationToken = default);
+        Task<PackageUploadedUnityVersionDataResponse> GetPackageUploadedVersions(Package package, CancellationToken cancellationToken = default);
+        Task<PackageUploadResponse> UploadPackage(IPackageUploader uploader, IProgress<float> progress = null, CancellationToken cancellationToken = default);
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/IAssetStoreApi.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/IAssetStoreApi.cs.meta
new file mode 100644
index 0000000..6caa9aa
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/IAssetStoreApi.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: e616488c25d278741bb0d08168219309
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/IAssetStoreApi.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/IAssetStoreClient.cs b/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/IAssetStoreClient.cs
new file mode 100644
index 0000000..993b8bf
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/IAssetStoreClient.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace AssetStoreTools.Api
+{
+    internal interface IAssetStoreClient
+    {
+        void SetSessionId(string sessionId);
+        void ClearSessionId();
+
+        Task<HttpResponseMessage> Get(Uri uri, CancellationToken cancellationToken = default);
+        Task<HttpResponseMessage> Post(Uri uri, HttpContent content, CancellationToken cancellationToken = default);
+        Task<HttpResponseMessage> Put(Uri uri, HttpContent content, CancellationToken cancellationToken = default);
+        Task<HttpResponseMessage> Send(HttpRequestMessage request, CancellationToken cancellationToken = default);
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/IAssetStoreClient.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/IAssetStoreClient.cs.meta
new file mode 100644
index 0000000..eeb360c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/IAssetStoreClient.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: b2bbadec62178cc4189e605367b219e7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/IAssetStoreClient.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/IAuthenticationType.cs b/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/IAuthenticationType.cs
new file mode 100644
index 0000000..6ce4320
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/IAuthenticationType.cs
@@ -0,0 +1,11 @@
+using AssetStoreTools.Api.Responses;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace AssetStoreTools.Api
+{
+    internal interface IAuthenticationType
+    {
+        Task<AuthenticationResponse> Authenticate(IAssetStoreClient client, CancellationToken cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/IAuthenticationType.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/IAuthenticationType.cs.meta
new file mode 100644
index 0000000..a713c84
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/IAuthenticationType.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 0000dcd6975bc8e4abc546a19f194040
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/IAuthenticationType.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/IPackageUploader.cs b/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/IPackageUploader.cs
new file mode 100644
index 0000000..1a1ad73
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/IPackageUploader.cs
@@ -0,0 +1,12 @@
+using AssetStoreTools.Api.Responses;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace AssetStoreTools.Api
+{
+    internal interface IPackageUploader
+    {
+        Task<PackageUploadResponse> Upload(IAssetStoreClient client, IProgress<float> progress, CancellationToken cancellationToken = default);
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/IPackageUploader.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/IPackageUploader.cs.meta
new file mode 100644
index 0000000..b8c5fa0
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/IPackageUploader.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 0fc6c47b1c0a65540a40efbf1491193b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/IPackageUploader.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/PackageUploaderBase.cs b/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/PackageUploaderBase.cs
new file mode 100644
index 0000000..ee65433
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/PackageUploaderBase.cs
@@ -0,0 +1,59 @@
+using AssetStoreTools.Api.Responses;
+using System;
+using System.IO;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace AssetStoreTools.Api
+{
+    internal abstract class PackageUploaderBase : IPackageUploader
+    {
+        protected const int UploadChunkSizeBytes = 32768;
+        protected const int UploadResponseTimeoutMs = 10000;
+
+        protected abstract void ValidateSettings();
+        public abstract Task<PackageUploadResponse> Upload(IAssetStoreClient client, IProgress<float> progress = null, CancellationToken cancellationToken = default);
+
+        protected void EnsureSuccessResponse(HttpResponseMessage response)
+        {
+            try
+            {
+                response.EnsureSuccessStatusCode();
+            }
+            catch
+            {
+                throw new Exception(response.Content.ReadAsStringAsync().Result);
+            }
+        }
+
+        protected void WaitForUploadCompletion(Task<HttpResponseMessage> response, FileStream requestFileStream, IProgress<float> progress, CancellationToken cancellationToken)
+        {
+            // Progress tracking
+            int updateIntervalMs = 100;
+            bool allBytesSent = false;
+            DateTime timeOfCompletion = default;
+
+            while (!response.IsCompleted)
+            {
+                float uploadProgress = (float)requestFileStream.Position / requestFileStream.Length * 100;
+                progress?.Report(uploadProgress);
+                Thread.Sleep(updateIntervalMs);
+
+                // A timeout for rare cases, when package uploading reaches 100%, but Put task IsComplete value remains 'False'
+                if (requestFileStream.Position == requestFileStream.Length)
+                {
+                    if (!allBytesSent)
+                    {
+                        allBytesSent = true;
+                        timeOfCompletion = DateTime.UtcNow;
+                    }
+                    else if (DateTime.UtcNow.Subtract(timeOfCompletion).TotalMilliseconds > UploadResponseTimeoutMs)
+                    {
+                        throw new TimeoutException();
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/PackageUploaderBase.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/PackageUploaderBase.cs.meta
new file mode 100644
index 0000000..3b255ee
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/PackageUploaderBase.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 2718ddd16e425ba4a82ab973724bcff7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Api/Abstractions/PackageUploaderBase.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/ApiUtility.cs b/Packages/com.unity.asset-store-tools/Editor/Api/ApiUtility.cs
new file mode 100644
index 0000000..c6bf904
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/ApiUtility.cs
@@ -0,0 +1,76 @@
+using AssetStoreTools.Api.Models;
+using AssetStoreTools.Utility;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditorInternal;
+
+namespace AssetStoreTools.Api
+{
+    internal class ApiUtility
+    {
+        public static Uri CreateUri(string url, bool includeDefaultAssetStoreQuery) => CreateUri(url, null, includeDefaultAssetStoreQuery);
+        public static Uri CreateUri(string url, IDictionary<string, string> queryParameters, bool includeDefaultAssetStoreQuery)
+        {
+            IDictionary<string, string> fullQueryParameters = includeDefaultAssetStoreQuery ?
+                    Constants.Api.DefaultAssetStoreQuery() : new Dictionary<string, string>();
+
+            if (queryParameters != null && queryParameters.Count > 0)
+            {
+                foreach (var kvp in queryParameters)
+                    fullQueryParameters.Add(kvp);
+            }
+
+            var builder = new UriBuilder(url);
+            if (fullQueryParameters.Count == 0)
+                return builder.Uri;
+
+            var fullQueryParameterString = string.Empty;
+            foreach (var queryParam in fullQueryParameters)
+            {
+                var escapedValue = queryParam.Value != null ? Uri.EscapeDataString(queryParam.Value) : string.Empty;
+                fullQueryParameterString += $"{queryParam.Key}={escapedValue}&";
+            }
+            fullQueryParameterString = fullQueryParameterString.Remove(fullQueryParameterString.Length - 1);
+
+            builder.Query = fullQueryParameterString;
+            return builder.Uri;
+        }
+
+        public static List<Package> CombinePackageData(List<Package> mainPackageData, List<PackageAdditionalData> extraPackageData, List<Category> categoryData)
+        {
+            foreach (var package in mainPackageData)
+            {
+                var extraData = extraPackageData.FirstOrDefault(x => package.PackageId == x.PackageId);
+
+                if (extraData == null)
+                {
+                    ASDebug.LogWarning($"Could not find extra data for Package {package.PackageId}");
+                    continue;
+                }
+
+                var categoryId = extraData.CategoryId;
+                var category = categoryData.FirstOrDefault(x => x.Id.ToString() == categoryId);
+                if (category != null)
+                    package.Category = category.Name;
+                else
+                    package.Category = "Unknown";
+
+                package.Modified = extraData.Modified;
+                package.Size = extraData.Size;
+            }
+
+            return mainPackageData;
+        }
+
+        public static string GetLicenseHash()
+        {
+            return InternalEditorUtility.GetAuthToken().Substring(0, 40);
+        }
+
+        public static string GetHardwareHash()
+        {
+            return InternalEditorUtility.GetAuthToken().Substring(40, 40);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/ApiUtility.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Api/ApiUtility.cs.meta
new file mode 100644
index 0000000..0259bfc
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/ApiUtility.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 5becec0b3c0ba274fb0b01544e63b6c4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Api/ApiUtility.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/AssetStoreApi.cs b/Packages/com.unity.asset-store-tools/Editor/Api/AssetStoreApi.cs
new file mode 100644
index 0000000..e5aa281
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/AssetStoreApi.cs
@@ -0,0 +1,268 @@
+using AssetStoreTools.Api.Models;
+using AssetStoreTools.Api.Responses;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace AssetStoreTools.Api
+{
+    internal class AssetStoreApi : IAssetStoreApi
+    {
+        private IAssetStoreClient _client;
+
+        public AssetStoreApi(IAssetStoreClient client)
+        {
+            _client = client;
+        }
+
+        public async Task<AssetStoreToolsVersionResponse> GetLatestAssetStoreToolsVersion(CancellationToken cancellationToken = default)
+        {
+            try
+            {
+                var uri = ApiUtility.CreateUri(Constants.Api.AssetStoreToolsLatestVersionUrl, false);
+                var response = await _client.Get(uri, cancellationToken);
+                cancellationToken.ThrowIfCancellationRequested();
+                response.EnsureSuccessStatusCode();
+                var responseStr = response.Content.ReadAsStringAsync().Result;
+                return new AssetStoreToolsVersionResponse(responseStr);
+            }
+            catch (OperationCanceledException e)
+            {
+                return new AssetStoreToolsVersionResponse() { Success = false, Cancelled = true, Exception = e };
+            }
+            catch (Exception e)
+            {
+                return new AssetStoreToolsVersionResponse() { Success = false, Exception = e };
+            }
+        }
+
+        public async Task<AuthenticationResponse> Authenticate(IAuthenticationType authenticationType, CancellationToken cancellationToken = default)
+        {
+            try
+            {
+                var loginResponse = await authenticationType.Authenticate(_client, cancellationToken);
+                if (loginResponse.Success)
+                {
+                    _client.SetSessionId(loginResponse.User.SessionId);
+                }
+
+                return loginResponse;
+            }
+            catch (OperationCanceledException e)
+            {
+                return new AuthenticationResponse() { Success = false, Cancelled = true, Exception = e };
+            }
+            catch (Exception e)
+            {
+                return new AuthenticationResponse() { Success = false, Exception = e };
+            }
+        }
+
+        public void Deauthenticate()
+        {
+            _client.ClearSessionId();
+        }
+
+        public async Task<PackagesDataResponse> GetPackages(CancellationToken cancellationToken = default)
+        {
+            try
+            {
+                var mainDataResponse = await GetPackageDataMain(cancellationToken);
+                if (!mainDataResponse.Success)
+                    throw mainDataResponse.Exception;
+                var additionalDataResponse = await GetPackageDataExtra(cancellationToken);
+                if (!additionalDataResponse.Success)
+                    throw additionalDataResponse.Exception;
+                var categoryDataResponse = await GetCategories(cancellationToken);
+                if (!categoryDataResponse.Success)
+                    throw categoryDataResponse.Exception;
+
+                var joinedData = ApiUtility.CombinePackageData(mainDataResponse.Packages, additionalDataResponse.Packages, categoryDataResponse.Categories);
+                return new PackagesDataResponse() { Success = true, Packages = joinedData };
+            }
+            catch (OperationCanceledException e)
+            {
+                return new PackagesDataResponse() { Success = false, Cancelled = true, Exception = e };
+            }
+            catch (Exception e)
+            {
+                return new PackagesDataResponse() { Success = false, Exception = e };
+            }
+        }
+
+        private async Task<PackagesDataResponse> GetPackageDataMain(CancellationToken cancellationToken)
+        {
+            try
+            {
+                var uri = ApiUtility.CreateUri(Constants.Api.GetPackagesUrl, true);
+                var response = await _client.Get(uri, cancellationToken);
+
+                cancellationToken.ThrowIfCancellationRequested();
+                response.EnsureSuccessStatusCode();
+
+                var responseStr = response.Content.ReadAsStringAsync().Result;
+                return new PackagesDataResponse(responseStr);
+            }
+            catch (OperationCanceledException e)
+            {
+                return new PackagesDataResponse() { Success = false, Cancelled = true, Exception = e };
+            }
+            catch (Exception e)
+            {
+                return new PackagesDataResponse() { Success = false, Exception = e };
+            }
+        }
+
+        private async Task<PackagesAdditionalDataResponse> GetPackageDataExtra(CancellationToken cancellationToken)
+        {
+            try
+            {
+                var uri = ApiUtility.CreateUri(Constants.Api.GetPackagesAdditionalDataUrl, true);
+                var response = await _client.Get(uri, cancellationToken);
+
+                cancellationToken.ThrowIfCancellationRequested();
+                response.EnsureSuccessStatusCode();
+
+                var responseStr = response.Content.ReadAsStringAsync().Result;
+                return new PackagesAdditionalDataResponse(responseStr);
+            }
+            catch (OperationCanceledException e)
+            {
+                return new PackagesAdditionalDataResponse() { Success = false, Cancelled = true, Exception = e };
+            }
+            catch (Exception e)
+            {
+                return new PackagesAdditionalDataResponse() { Success = false, Exception = e };
+            }
+        }
+
+        public async Task<CategoryDataResponse> GetCategories(CancellationToken cancellationToken)
+        {
+            try
+            {
+                var uri = ApiUtility.CreateUri(Constants.Api.GetCategoriesUrl, true);
+                var response = await _client.Get(uri, cancellationToken);
+
+                cancellationToken.ThrowIfCancellationRequested();
+                response.EnsureSuccessStatusCode();
+
+                var responseStr = response.Content.ReadAsStringAsync().Result;
+                return new CategoryDataResponse(responseStr);
+            }
+            catch (OperationCanceledException e)
+            {
+                return new CategoryDataResponse() { Success = false, Cancelled = true, Exception = e };
+            }
+            catch (Exception e)
+            {
+                return new CategoryDataResponse() { Success = false, Exception = e };
+            }
+        }
+
+        public async Task<PackageThumbnailResponse> GetPackageThumbnail(Package package, CancellationToken cancellationToken = default)
+        {
+            try
+            {
+                if (string.IsNullOrEmpty(package.IconUrl))
+                    throw new Exception($"Could not retrieve thumbnail for package {package.PackageId} - icon url is null");
+
+                var response = await _client.Get(new Uri(package.IconUrl), cancellationToken);
+
+                cancellationToken.ThrowIfCancellationRequested();
+                response.EnsureSuccessStatusCode();
+
+                var responseBytes = response.Content.ReadAsByteArrayAsync().Result;
+                return new PackageThumbnailResponse(responseBytes);
+            }
+            catch (OperationCanceledException e)
+            {
+                return new PackageThumbnailResponse() { Success = false, Cancelled = true, Exception = e };
+            }
+            catch (Exception e)
+            {
+                return new PackageThumbnailResponse() { Success = false, Exception = e };
+            }
+        }
+
+        public async Task<RefreshedPackageDataResponse> RefreshPackageMetadata(Package package, CancellationToken cancellationToken = default)
+        {
+            try
+            {
+                var refreshedPackage = JObject.FromObject(package).DeepClone().ToObject<Package>();
+
+                var packagesResponse = await GetPackageDataExtra(cancellationToken);
+                if (!packagesResponse.Success)
+                    throw packagesResponse.Exception;
+
+                // Find the updated package data in the latest data json
+                var packageRefreshSource = packagesResponse.Packages.FirstOrDefault(x => x.PackageId == refreshedPackage.PackageId);
+                if (packageRefreshSource == null)
+                    return new RefreshedPackageDataResponse() { Success = false, Exception = new MissingMemberException($"Unable to find downloaded package data for package id {package.PackageId}") };
+
+                // Retrieve the category map
+                var categoryData = await GetCategories(cancellationToken);
+                if (!categoryData.Success)
+                    return new RefreshedPackageDataResponse() { Success = false, Exception = packagesResponse.Exception };
+
+                // Update the package data
+                refreshedPackage.Name = packageRefreshSource.Name;
+                refreshedPackage.Status = packageRefreshSource.Status;
+                var newCategory = categoryData.Categories.FirstOrDefault(x => x.Id.ToString() == packageRefreshSource.CategoryId);
+                refreshedPackage.Category = newCategory != null ? newCategory.Name : "Unknown";
+                refreshedPackage.Modified = packageRefreshSource.Modified;
+                refreshedPackage.Size = packageRefreshSource.Size;
+
+                return new RefreshedPackageDataResponse() { Success = true, Package = refreshedPackage };
+            }
+            catch (OperationCanceledException)
+            {
+                return new RefreshedPackageDataResponse() { Success = false, Cancelled = true };
+            }
+            catch (Exception e)
+            {
+                return new RefreshedPackageDataResponse() { Success = false, Exception = e };
+            }
+        }
+
+        public async Task<PackageUploadedUnityVersionDataResponse> GetPackageUploadedVersions(Package package, CancellationToken cancellationToken = default)
+        {
+            try
+            {
+                var uri = ApiUtility.CreateUri(Constants.Api.GetPackageUploadedVersionsUrl(package.PackageId, package.VersionId), true);
+                var response = await _client.Get(uri, cancellationToken);
+
+                cancellationToken.ThrowIfCancellationRequested();
+                response.EnsureSuccessStatusCode();
+
+                var responseStr = response.Content.ReadAsStringAsync().Result;
+                return new PackageUploadedUnityVersionDataResponse(responseStr);
+            }
+            catch (OperationCanceledException e)
+            {
+                return new PackageUploadedUnityVersionDataResponse() { Success = false, Cancelled = true, Exception = e };
+            }
+            catch (Exception e)
+            {
+                return new PackageUploadedUnityVersionDataResponse() { Success = false, Exception = e };
+            }
+        }
+
+        public async Task<PackageUploadResponse> UploadPackage(IPackageUploader uploader, IProgress<float> progress = null, CancellationToken cancellationToken = default)
+        {
+            try
+            {
+                return await uploader.Upload(_client, progress, cancellationToken);
+            }
+            catch (OperationCanceledException e)
+            {
+                return new PackageUploadResponse() { Success = false, Cancelled = true, Exception = e };
+            }
+            catch (Exception e)
+            {
+                return new PackageUploadResponse() { Success = false, Exception = e };
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/AssetStoreApi.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Api/AssetStoreApi.cs.meta
new file mode 100644
index 0000000..3763396
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/AssetStoreApi.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 684fca3fffd79d944a32d9b3adbfc007
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Api/AssetStoreApi.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/AssetStoreClient.cs b/Packages/com.unity.asset-store-tools/Editor/Api/AssetStoreClient.cs
new file mode 100644
index 0000000..e1d5506
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/AssetStoreClient.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace AssetStoreTools.Api
+{
+    internal class AssetStoreClient : IAssetStoreClient
+    {
+        private HttpClient _httpClient;
+
+        public AssetStoreClient()
+        {
+            ServicePointManager.DefaultConnectionLimit = 500;
+            _httpClient = new HttpClient();
+            _httpClient.DefaultRequestHeaders.ConnectionClose = false;
+            _httpClient.DefaultRequestHeaders.Add("Accept", "application/json");
+            _httpClient.Timeout = TimeSpan.FromMinutes(1320);
+        }
+
+        public void SetSessionId(string sessionId)
+        {
+            ClearSessionId();
+
+            if (!string.IsNullOrEmpty(sessionId))
+                _httpClient.DefaultRequestHeaders.Add("X-Unity-Session", sessionId);
+        }
+
+        public void ClearSessionId()
+        {
+            _httpClient.DefaultRequestHeaders.Remove("X-Unity-Session");
+        }
+
+        public Task<HttpResponseMessage> Get(Uri uri, CancellationToken cancellationToken = default)
+        {
+            return _httpClient.GetAsync(uri, cancellationToken);
+        }
+
+        public Task<HttpResponseMessage> Post(Uri uri, HttpContent content, CancellationToken cancellationToken = default)
+        {
+            return _httpClient.PostAsync(uri, content, cancellationToken);
+        }
+
+        public Task<HttpResponseMessage> Put(Uri uri, HttpContent content, CancellationToken cancellationToken = default)
+        {
+            return _httpClient.PutAsync(uri, content, cancellationToken);
+        }
+
+        public Task<HttpResponseMessage> Send(HttpRequestMessage request, CancellationToken cancellationToken = default)
+        {
+            return _httpClient.SendAsync(request, cancellationToken);
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/AssetStoreClient.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Api/AssetStoreClient.cs.meta
new file mode 100644
index 0000000..10ea6ae
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/AssetStoreClient.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 80b4527c908161a4b9f06dc393b502f9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Api/AssetStoreClient.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/CloudTokenAuthentication.cs b/Packages/com.unity.asset-store-tools/Editor/Api/CloudTokenAuthentication.cs
new file mode 100644
index 0000000..53f7146
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/CloudTokenAuthentication.cs
@@ -0,0 +1,25 @@
+using AssetStoreTools.Api.Responses;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace AssetStoreTools.Api
+{
+    internal class CloudTokenAuthentication : AuthenticationBase
+    {
+        public CloudTokenAuthentication(string cloudToken)
+        {
+            AuthenticationContent = GetAuthenticationContent(
+                new KeyValuePair<string, string>("user_access_token", cloudToken)
+                );
+        }
+
+        public override async Task<AuthenticationResponse> Authenticate(IAssetStoreClient client, CancellationToken cancellationToken)
+        {
+            var result = await client.Post(LoginUrl, AuthenticationContent, cancellationToken);
+            cancellationToken.ThrowIfCancellationRequested();
+
+            return ParseResponse(result);
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/CloudTokenAuthentication.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Api/CloudTokenAuthentication.cs.meta
new file mode 100644
index 0000000..06064fc
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/CloudTokenAuthentication.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 99f1baec74f26a34bb972b19c92d523f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Api/CloudTokenAuthentication.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/CredentialsAuthentication.cs b/Packages/com.unity.asset-store-tools/Editor/Api/CredentialsAuthentication.cs
new file mode 100644
index 0000000..1e0b7ff
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/CredentialsAuthentication.cs
@@ -0,0 +1,26 @@
+using AssetStoreTools.Api.Responses;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace AssetStoreTools.Api
+{
+    internal class CredentialsAuthentication : AuthenticationBase
+    {
+        public CredentialsAuthentication(string email, string password)
+        {
+            AuthenticationContent = GetAuthenticationContent(
+                new KeyValuePair<string, string>("user", email),
+                new KeyValuePair<string, string>("pass", password)
+                );
+        }
+
+        public override async Task<AuthenticationResponse> Authenticate(IAssetStoreClient client, CancellationToken cancellationToken)
+        {
+            var result = await client.Post(LoginUrl, AuthenticationContent, cancellationToken);
+            cancellationToken.ThrowIfCancellationRequested();
+
+            return ParseResponse(result);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/CredentialsAuthentication.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Api/CredentialsAuthentication.cs.meta
new file mode 100644
index 0000000..53e59db
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/CredentialsAuthentication.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 353e556b63fd441428f387bc85aa612c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Api/CredentialsAuthentication.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Models.meta b/Packages/com.unity.asset-store-tools/Editor/Api/Models.meta
new file mode 100644
index 0000000..bfcab0b
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Models.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1f83e4b5507886f4b873c22c146b8f6a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Models/Category.cs b/Packages/com.unity.asset-store-tools/Editor/Api/Models/Category.cs
new file mode 100644
index 0000000..3cb84d2
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Models/Category.cs
@@ -0,0 +1,58 @@
+using Newtonsoft.Json.Serialization;
+using System.Collections.Generic;
+
+namespace AssetStoreTools.Api.Models
+{
+    internal class Category
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+        public string Status { get; set; }
+
+        public class AssetStoreCategoryResolver : DefaultContractResolver
+        {
+            private Dictionary<string, string> _propertyConversions;
+
+            public AssetStoreCategoryResolver()
+            {
+                _propertyConversions = new Dictionary<string, string>()
+                {
+                    { nameof(Category.Name), "assetstore_name" }
+                };
+            }
+
+            protected override string ResolvePropertyName(string propertyName)
+            {
+                if (_propertyConversions.ContainsKey(propertyName))
+                    return _propertyConversions[propertyName];
+
+                return base.ResolvePropertyName(propertyName);
+            }
+        }
+
+        public class CachedCategoryResolver : DefaultContractResolver
+        {
+            private static CachedCategoryResolver _instance;
+            public static CachedCategoryResolver Instance => _instance ?? (_instance = new CachedCategoryResolver());
+
+            private Dictionary<string, string> _propertyConversion;
+
+            private CachedCategoryResolver()
+            {
+                this.NamingStrategy = new SnakeCaseNamingStrategy();
+                _propertyConversion = new Dictionary<string, string>()
+                {
+                    { nameof(Category.Name), "name" }
+                };
+            }
+
+            protected override string ResolvePropertyName(string propertyName)
+            {
+                if (_propertyConversion.ContainsKey(propertyName))
+                    return _propertyConversion[propertyName];
+
+                return base.ResolvePropertyName(propertyName);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Models/Category.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Api/Models/Category.cs.meta
new file mode 100644
index 0000000..8a88ac8
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Models/Category.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 5897866bc65f5834dab1f17371daada7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Api/Models/Category.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Models/Package.cs b/Packages/com.unity.asset-store-tools/Editor/Api/Models/Package.cs
new file mode 100644
index 0000000..f322bba
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Models/Package.cs
@@ -0,0 +1,80 @@
+using Newtonsoft.Json.Serialization;
+using System.Collections.Generic;
+
+namespace AssetStoreTools.Api.Models
+{
+    internal class Package
+    {
+        public string PackageId { get; set; }
+        public string VersionId { get; set; }
+        public string Name { get; set; }
+        public string Status { get; set; }
+        public string Category { get; set; }
+        public bool IsCompleteProject { get; set; }
+        public string RootGuid { get; set; }
+        public string RootPath { get; set; }
+        public string ProjectPath { get; set; }
+        public string Modified { get; set; }
+        public string Size { get; set; }
+        public string IconUrl { get; set; }
+
+        public class AssetStorePackageResolver : DefaultContractResolver
+        {
+            private static AssetStorePackageResolver _instance;
+            public static AssetStorePackageResolver Instance => _instance ?? (_instance = new AssetStorePackageResolver());
+
+            private Dictionary<string, string> _propertyConversions;
+
+            private AssetStorePackageResolver()
+            {
+                _propertyConversions = new Dictionary<string, string>()
+                {
+                    { nameof(Package.VersionId), "id" },
+                    { nameof(Package.IsCompleteProject), "is_complete_project" },
+                    { nameof(Package.RootGuid), "root_guid" },
+                    { nameof(Package.RootPath), "root_path" },
+                    { nameof(Package.ProjectPath), "project_path" },
+                    { nameof(Package.IconUrl), "icon_url" }
+                };
+            }
+
+            protected override string ResolvePropertyName(string propertyName)
+            {
+                if (_propertyConversions.ContainsKey(propertyName))
+                    return _propertyConversions[propertyName];
+
+                return base.ResolvePropertyName(propertyName);
+            }
+        }
+
+        public class CachedPackageResolver : DefaultContractResolver
+        {
+            private static CachedPackageResolver _instance;
+            public static CachedPackageResolver Instance => _instance ?? (_instance = new CachedPackageResolver());
+
+            private Dictionary<string, string> _propertyConversion;
+
+            private CachedPackageResolver()
+            {
+                this.NamingStrategy = new SnakeCaseNamingStrategy();
+                _propertyConversion = new Dictionary<string, string>()
+                {
+                    { nameof(Package.PackageId), "package_id" },
+                    { nameof(Package.VersionId), "version_id" },
+                    { nameof(Package.IsCompleteProject), "is_complete_project" },
+                    { nameof(Package.RootGuid), "root_guid" },
+                    { nameof(Package.RootPath), "root_path" },
+                    { nameof(Package.IconUrl), "icon_url" }
+                };
+            }
+
+            protected override string ResolvePropertyName(string propertyName)
+            {
+                if (_propertyConversion.ContainsKey(propertyName))
+                    return _propertyConversion[propertyName];
+
+                return base.ResolvePropertyName(propertyName);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Models/Package.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Api/Models/Package.cs.meta
new file mode 100644
index 0000000..79fb6c2
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Models/Package.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 7e9f0b99820061b49abf6e8cf544a727
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Api/Models/Package.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Models/PackageAdditionalData.cs b/Packages/com.unity.asset-store-tools/Editor/Api/Models/PackageAdditionalData.cs
new file mode 100644
index 0000000..f10a636
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Models/PackageAdditionalData.cs
@@ -0,0 +1,41 @@
+using Newtonsoft.Json.Serialization;
+using System.Collections.Generic;
+
+namespace AssetStoreTools.Api.Models
+{
+    internal class PackageAdditionalData
+    {
+        public string Name { get; set; }
+        public string Status { get; set; }
+        public string PackageId { get; set; }
+        public string VersionId { get; set; }
+        public string CategoryId { get; set; }
+        public string Modified { get; set; }
+        public string Size { get; set; }
+
+        public class AssetStorePackageResolver : DefaultContractResolver
+        {
+            private static AssetStorePackageResolver _instance;
+            public static AssetStorePackageResolver Instance => _instance ?? (_instance = new AssetStorePackageResolver());
+
+            private Dictionary<string, string> _propertyConversions;
+
+            private AssetStorePackageResolver()
+            {
+                _propertyConversions = new Dictionary<string, string>()
+                {
+                    { nameof(PackageAdditionalData.PackageId), "id" },
+                    { nameof(PackageAdditionalData.CategoryId), "category_id" }
+                };
+            }
+
+            protected override string ResolvePropertyName(string propertyName)
+            {
+                if (_propertyConversions.ContainsKey(propertyName))
+                    return _propertyConversions[propertyName];
+
+                return base.ResolvePropertyName(propertyName);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Models/PackageAdditionalData.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Api/Models/PackageAdditionalData.cs.meta
new file mode 100644
index 0000000..41f8b1f
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Models/PackageAdditionalData.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 0663f29f3fcd0e34ab77338d1bdbb528
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Api/Models/PackageAdditionalData.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Models/User.cs b/Packages/com.unity.asset-store-tools/Editor/Api/Models/User.cs
new file mode 100644
index 0000000..6739a76
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Models/User.cs
@@ -0,0 +1,51 @@
+using Newtonsoft.Json.Serialization;
+using System.Collections.Generic;
+
+namespace AssetStoreTools.Api.Models
+{
+    internal class User
+    {
+        public string Id { get; set; }
+        public string SessionId { get; set; }
+        public string Name { get; set; }
+        public string Username { get; set; }
+        public string PublisherId { get; set; }
+        public bool IsPublisher => !string.IsNullOrEmpty(PublisherId);
+
+        public override string ToString()
+        {
+            return
+                $"{nameof(Id)}: {Id}\n" +
+                $"{nameof(Name)}: {Name}\n" +
+                $"{nameof(Username)}: {Username}\n" +
+                $"{nameof(PublisherId)}: {PublisherId}\n" +
+                $"{nameof(IsPublisher)}: {IsPublisher}\n" +
+                $"{nameof(SessionId)}: [HIDDEN]";
+        }
+
+        public class AssetStoreUserResolver : DefaultContractResolver
+        {
+            private static AssetStoreUserResolver _instance;
+            public static AssetStoreUserResolver Instance => _instance ?? (_instance = new AssetStoreUserResolver());
+
+            private Dictionary<string, string> _propertyConversions;
+
+            private AssetStoreUserResolver()
+            {
+                _propertyConversions = new Dictionary<string, string>()
+                {
+                    { nameof(User.SessionId), "xunitysession" },
+                    { nameof(User.PublisherId), "publisher" }
+                };
+            }
+
+            protected override string ResolvePropertyName(string propertyName)
+            {
+                if (_propertyConversions.ContainsKey(propertyName))
+                    return _propertyConversions[propertyName];
+
+                return base.ResolvePropertyName(propertyName);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Models/User.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Api/Models/User.cs.meta
new file mode 100644
index 0000000..76244da
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Models/User.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: caf38df5cd685a345a1ebec8f7651c93
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Api/Models/User.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Responses.meta b/Packages/com.unity.asset-store-tools/Editor/Api/Responses.meta
new file mode 100644
index 0000000..534c529
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Responses.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 49581213e7b6ca645955cce8ce23ac4b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Responses/AssetStoreResponse.cs b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/AssetStoreResponse.cs
new file mode 100644
index 0000000..d9dc304
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/AssetStoreResponse.cs
@@ -0,0 +1,45 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+
+namespace AssetStoreTools.Api.Responses
+{
+    /// <summary>
+    /// A structure used to return the success outcome and the result of Asset Store API calls
+    /// </summary>
+    internal class AssetStoreResponse
+    {
+        public bool Success { get; set; } = false;
+        public bool Cancelled { get; set; } = false;
+        public Exception Exception { get; set; }
+
+        public AssetStoreResponse() { }
+
+        public AssetStoreResponse(Exception e) : this()
+        {
+            Exception = e;
+        }
+
+        protected void ValidateAssetStoreResponse(string json)
+        {
+            var dict = JsonConvert.DeserializeObject<JObject>(json);
+            if (dict == null)
+                throw new Exception("Response is empty");
+
+            // Some json responses return an error field on error
+            if (dict.ContainsKey("error"))
+            {
+                // Server side error message
+                // Do not write to console since this is an error that 
+                // is "expected" ie. can be handled by the gui.
+                throw new Exception(dict.GetValue("error").ToString());
+            }
+            // Some json responses return status+message fields instead of an error field. Go figure.
+            else if (dict.ContainsKey("status") && dict.GetValue("status").ToString() != "ok"
+                && dict.ContainsKey("message"))
+            {
+                throw new Exception(dict.GetValue("message").ToString());
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Responses/AssetStoreResponse.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/AssetStoreResponse.cs.meta
new file mode 100644
index 0000000..11f75b6
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/AssetStoreResponse.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: ee338db031a0cfb459f7cac7f41a5d75
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Api/Responses/AssetStoreResponse.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Responses/AssetStoreToolsVersionResponse.cs b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/AssetStoreToolsVersionResponse.cs
new file mode 100644
index 0000000..de43c91
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/AssetStoreToolsVersionResponse.cs
@@ -0,0 +1,38 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+
+namespace AssetStoreTools.Api.Responses
+{
+    internal class AssetStoreToolsVersionResponse : AssetStoreResponse
+    {
+        public string Version { get; set; }
+
+        public AssetStoreToolsVersionResponse() : base() { }
+        public AssetStoreToolsVersionResponse(Exception e) : base(e) { }
+
+        public AssetStoreToolsVersionResponse(string json)
+        {
+            try
+            {
+                ValidateAssetStoreResponse(json);
+                ParseVersion(json);
+                Success = true;
+            }
+            catch (Exception e)
+            {
+                Success = false;
+                Exception = e;
+            }
+        }
+
+        private void ParseVersion(string json)
+        {
+            var dict = JsonConvert.DeserializeObject<JObject>(json);
+            if (!dict.ContainsKey("version"))
+                throw new Exception("Version was not found");
+
+            Version = dict.GetValue("version").ToString();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Responses/AssetStoreToolsVersionResponse.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/AssetStoreToolsVersionResponse.cs.meta
new file mode 100644
index 0000000..64eb625
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/AssetStoreToolsVersionResponse.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 40558675926f913478a654350149209e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Api/Responses/AssetStoreToolsVersionResponse.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Responses/AuthenticationResponse.cs b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/AuthenticationResponse.cs
new file mode 100644
index 0000000..64a3cc8
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/AuthenticationResponse.cs
@@ -0,0 +1,74 @@
+using AssetStoreTools.Api.Models;
+using Newtonsoft.Json;
+using System;
+using System.Net;
+using System.Net.Http;
+
+namespace AssetStoreTools.Api.Responses
+{
+    internal class AuthenticationResponse : AssetStoreResponse
+    {
+        public User User { get; set; }
+
+        public AuthenticationResponse() : base() { }
+
+        public AuthenticationResponse(Exception e) : base(e) { }
+
+        public AuthenticationResponse(HttpStatusCode statusCode, HttpRequestException fallbackException)
+        {
+            string message;
+            switch (statusCode)
+            {
+                case HttpStatusCode.Unauthorized:
+                    message = "Incorrect email and/or password. Please try again.";
+                    break;
+                case HttpStatusCode.InternalServerError:
+                    message = "Authentication request failed\nIf you were logging in with your Unity Cloud account, please make sure you are still logged in.\n" +
+                        "This might also be caused by too many invalid login attempts - if that is the case, please try again later.";
+                    break;
+                default:
+                    Exception = fallbackException;
+                    return;
+            }
+
+            Exception = new Exception(message);
+        }
+
+        public AuthenticationResponse(string json)
+        {
+            try
+            {
+                ValidateAssetStoreResponse(json);
+                var serializerSettings = new JsonSerializerSettings()
+                {
+                    ContractResolver = User.AssetStoreUserResolver.Instance
+                };
+                User = JsonConvert.DeserializeObject<User>(json, serializerSettings);
+                ValidateLoginData();
+                ValidatePublisher();
+                Success = true;
+            }
+            catch (Exception e)
+            {
+                Success = false;
+                Exception = e;
+            }
+        }
+
+        private void ValidateLoginData()
+        {
+            if (string.IsNullOrEmpty(User.Id)
+                || string.IsNullOrEmpty(User.SessionId)
+                || string.IsNullOrEmpty(User.Name)
+                || string.IsNullOrEmpty(User.Username))
+                throw new Exception("Could not parse the necessary publisher information from the response.");
+        }
+
+        private void ValidatePublisher()
+        {
+            if (!User.IsPublisher)
+                throw new Exception($"Your Unity ID {User.Name} is not currently connected to a publisher account. " +
+                          $"Please create a publisher profile.");
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Responses/AuthenticationResponse.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/AuthenticationResponse.cs.meta
new file mode 100644
index 0000000..a37ebf9
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/AuthenticationResponse.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: ec3a5cb59a7e78646b07f800d317874d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Api/Responses/AuthenticationResponse.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Responses/CategoryDataResponse.cs b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/CategoryDataResponse.cs
new file mode 100644
index 0000000..aacfed8
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/CategoryDataResponse.cs
@@ -0,0 +1,43 @@
+using AssetStoreTools.Api.Models;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+
+namespace AssetStoreTools.Api.Responses
+{
+    internal class CategoryDataResponse : AssetStoreResponse
+    {
+        public List<Category> Categories { get; set; }
+
+        public CategoryDataResponse() : base() { }
+        public CategoryDataResponse(Exception e) : base(e) { }
+
+        public CategoryDataResponse(string json)
+        {
+            try
+            {
+                var categoryArray = JsonConvert.DeserializeObject<JArray>(json);
+
+                Categories = new List<Category>();
+                var serializer = new JsonSerializer()
+                {
+                    ContractResolver = new Category.AssetStoreCategoryResolver()
+                };
+
+                foreach (var categoryData in categoryArray)
+                {
+                    var category = categoryData.ToObject<Category>(serializer);
+                    Categories.Add(category);
+                }
+
+                Success = true;
+            }
+            catch (Exception e)
+            {
+                Success = false;
+                Exception = e;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Responses/CategoryDataResponse.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/CategoryDataResponse.cs.meta
new file mode 100644
index 0000000..9684d20
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/CategoryDataResponse.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: e3789323453f1604286b436f77bdca97
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Api/Responses/CategoryDataResponse.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Responses/PackageThumbnailResponse.cs b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/PackageThumbnailResponse.cs
new file mode 100644
index 0000000..53ee82b
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/PackageThumbnailResponse.cs
@@ -0,0 +1,31 @@
+using System;
+using UnityEngine;
+
+namespace AssetStoreTools.Api.Responses
+{
+    internal class PackageThumbnailResponse : AssetStoreResponse
+    {
+        public Texture2D Thumbnail { get; set; }
+        public PackageThumbnailResponse() : base() { }
+        public PackageThumbnailResponse(Exception e) : base(e) { }
+
+        public PackageThumbnailResponse(byte[] textureBytes)
+        {
+            try
+            {
+                var tex = new Texture2D(1, 1, TextureFormat.RGBA32, false);
+                var success = tex.LoadImage(textureBytes);
+                if (!success)
+                    throw new Exception("Could not retrieve image from the provided texture bytes");
+
+                Thumbnail = tex;
+                Success = true;
+            }
+            catch (Exception e)
+            {
+                Success = false;
+                Exception = e;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Responses/PackageThumbnailResponse.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/PackageThumbnailResponse.cs.meta
new file mode 100644
index 0000000..2f957f5
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/PackageThumbnailResponse.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: dacfba636b3757e408514b850d715e18
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Api/Responses/PackageThumbnailResponse.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Responses/PackageUploadedUnityVersionDataResponse.cs b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/PackageUploadedUnityVersionDataResponse.cs
new file mode 100644
index 0000000..6811cd5
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/PackageUploadedUnityVersionDataResponse.cs
@@ -0,0 +1,44 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+
+namespace AssetStoreTools.Api.Responses
+{
+    internal class PackageUploadedUnityVersionDataResponse : AssetStoreResponse
+    {
+        public List<string> UnityVersions { get; set; }
+
+        public PackageUploadedUnityVersionDataResponse() : base() { }
+        public PackageUploadedUnityVersionDataResponse(Exception e) : base(e) { }
+
+        public PackageUploadedUnityVersionDataResponse(string json)
+        {
+            try
+            {
+                ValidateAssetStoreResponse(json);
+                ParseVersionData(json);
+                Success = true;
+            }
+            catch (Exception e)
+            {
+                Success = false;
+                Exception = e;
+            }
+        }
+
+        private void ParseVersionData(string json)
+        {
+            var data = JsonConvert.DeserializeObject<JObject>(json);
+            try
+            {
+                var content = data.GetValue("content").ToObject<JObject>();
+                UnityVersions = content.GetValue("unity_versions").ToObject<List<string>>();
+            }
+            catch
+            {
+                throw new Exception("Could not parse the unity versions array");
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Responses/PackageUploadedUnityVersionDataResponse.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/PackageUploadedUnityVersionDataResponse.cs.meta
new file mode 100644
index 0000000..fa263ee
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/PackageUploadedUnityVersionDataResponse.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 2552f659a600e124aa952f3ba760ddf3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Api/Responses/PackageUploadedUnityVersionDataResponse.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Responses/PackagesAdditionalDataResponse.cs b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/PackagesAdditionalDataResponse.cs
new file mode 100644
index 0000000..dab8683
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/PackagesAdditionalDataResponse.cs
@@ -0,0 +1,59 @@
+using AssetStoreTools.Api.Models;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+
+namespace AssetStoreTools.Api.Responses
+{
+    internal class PackagesAdditionalDataResponse : AssetStoreResponse
+    {
+        public List<PackageAdditionalData> Packages { get; set; }
+
+        public PackagesAdditionalDataResponse() : base() { }
+        public PackagesAdditionalDataResponse(Exception e) : base(e) { }
+
+        public PackagesAdditionalDataResponse(string json)
+        {
+            try
+            {
+                ValidateAssetStoreResponse(json);
+                ParseExtraData(json);
+                Success = true;
+            }
+            catch (Exception e)
+            {
+                Success = false;
+                Exception = e;
+            }
+        }
+
+        private void ParseExtraData(string json)
+        {
+            var packageDict = JsonConvert.DeserializeObject<JObject>(json);
+            if (!packageDict.ContainsKey("packages"))
+                throw new Exception("Response did not not contain the list of packages");
+
+            Packages = new List<PackageAdditionalData>();
+            var serializer = new JsonSerializer()
+            {
+                ContractResolver = PackageAdditionalData.AssetStorePackageResolver.Instance
+            };
+
+            var packageArray = packageDict.GetValue("packages").ToObject<JArray>();
+            foreach (var packageData in packageArray)
+            {
+                var package = packageData.ToObject<PackageAdditionalData>(serializer);
+
+                // Some fields are based on the latest version in the json
+                var latestVersion = packageData["versions"].ToObject<JArray>().Last;
+
+                package.VersionId = latestVersion["id"].ToString();
+                package.Modified = latestVersion["modified"].ToString();
+                package.Size = latestVersion["size"].ToString();
+
+                Packages.Add(package);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Responses/PackagesAdditionalDataResponse.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/PackagesAdditionalDataResponse.cs.meta
new file mode 100644
index 0000000..0590efe
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/PackagesAdditionalDataResponse.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 88d58ad5e0eea6345b5c83f30ee8ebd5
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Api/Responses/PackagesAdditionalDataResponse.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Responses/PackagesDataResponse.cs b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/PackagesDataResponse.cs
new file mode 100644
index 0000000..78c8e60
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/PackagesDataResponse.cs
@@ -0,0 +1,59 @@
+using AssetStoreTools.Api.Models;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+
+namespace AssetStoreTools.Api.Responses
+{
+    internal class PackagesDataResponse : AssetStoreResponse
+    {
+        public List<Package> Packages { get; set; }
+
+        public PackagesDataResponse() : base() { }
+        public PackagesDataResponse(Exception e) : base(e) { }
+
+        public PackagesDataResponse(string json)
+        {
+            try
+            {
+                ValidateAssetStoreResponse(json);
+                ParseMainData(json);
+                Success = true;
+            }
+            catch (Exception e)
+            {
+                Success = false;
+                Exception = e;
+            }
+        }
+
+        private void ParseMainData(string json)
+        {
+            var packageDict = JsonConvert.DeserializeObject<JObject>(json);
+            if (!packageDict.ContainsKey("packages"))
+                throw new Exception("Response did not not contain the list of packages");
+
+            Packages = new List<Package>();
+            var serializer = new JsonSerializer()
+            {
+                ContractResolver = Package.AssetStorePackageResolver.Instance
+            };
+
+            foreach (var packageToken in packageDict["packages"])
+            {
+                var property = (JProperty)packageToken;
+                var packageData = property.Value.ToObject<Package>(serializer);
+
+                // Package Id is the key of the package object
+                packageData.PackageId = property.Name;
+
+                // Package Icon Url is returned without the https: prefix
+                if (!string.IsNullOrEmpty(packageData.IconUrl))
+                    packageData.IconUrl = $"https:{packageData.IconUrl}";
+
+                Packages.Add(packageData);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Responses/PackagesDataResponse.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/PackagesDataResponse.cs.meta
new file mode 100644
index 0000000..f780da1
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/PackagesDataResponse.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 705ec748e689148479f54666993cd79d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Api/Responses/PackagesDataResponse.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Responses/RefreshedPackageDataResponse.cs b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/RefreshedPackageDataResponse.cs
new file mode 100644
index 0000000..97c0969
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/RefreshedPackageDataResponse.cs
@@ -0,0 +1,12 @@
+using AssetStoreTools.Api.Models;
+using System;
+
+namespace AssetStoreTools.Api.Responses
+{
+    internal class RefreshedPackageDataResponse : AssetStoreResponse
+    {
+        public Package Package { get; set; }
+        public RefreshedPackageDataResponse() { }
+        public RefreshedPackageDataResponse(Exception e) : base(e) { }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Responses/RefreshedPackageDataResponse.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/RefreshedPackageDataResponse.cs.meta
new file mode 100644
index 0000000..0607505
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/RefreshedPackageDataResponse.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 20f710024d5ed514db02672f12ac361c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Api/Responses/RefreshedPackageDataResponse.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Responses/UploadResponse.cs b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/UploadResponse.cs
new file mode 100644
index 0000000..5e6c21c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/UploadResponse.cs
@@ -0,0 +1,28 @@
+using System;
+
+namespace AssetStoreTools.Api.Responses
+{
+    internal class PackageUploadResponse : AssetStoreResponse
+    {
+        public UploadStatus Status { get; set; }
+
+        public PackageUploadResponse() : base() { }
+        public PackageUploadResponse(Exception e) : base(e) { }
+
+        public PackageUploadResponse(string json)
+        {
+            try
+            {
+                ValidateAssetStoreResponse(json);
+                Status = UploadStatus.Success;
+                Success = true;
+            }
+            catch (Exception e)
+            {
+                Success = false;
+                Status = UploadStatus.Fail;
+                Exception = e;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/Responses/UploadResponse.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/UploadResponse.cs.meta
new file mode 100644
index 0000000..8b61970
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/Responses/UploadResponse.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 8f1758cfa8119cf49a61b010a04352e4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Api/Responses/UploadResponse.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/SessionAuthentication.cs b/Packages/com.unity.asset-store-tools/Editor/Api/SessionAuthentication.cs
new file mode 100644
index 0000000..f0f0ea4
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/SessionAuthentication.cs
@@ -0,0 +1,25 @@
+using AssetStoreTools.Api.Responses;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace AssetStoreTools.Api
+{
+    internal class SessionAuthentication : AuthenticationBase
+    {
+        public SessionAuthentication(string sessionId)
+        {
+            AuthenticationContent = GetAuthenticationContent(
+                new KeyValuePair<string, string>("reuse_session", sessionId)
+                );
+        }
+
+        public override async Task<AuthenticationResponse> Authenticate(IAssetStoreClient client, CancellationToken cancellationToken)
+        {
+            var result = await client.Post(LoginUrl, AuthenticationContent, cancellationToken);
+            cancellationToken.ThrowIfCancellationRequested();
+
+            return ParseResponse(result);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/SessionAuthentication.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Api/SessionAuthentication.cs.meta
new file mode 100644
index 0000000..ca64f18
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/SessionAuthentication.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 02e970f660088cc4b89003608d59cd06
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Api/SessionAuthentication.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/UnityPackageUploader.cs b/Packages/com.unity.asset-store-tools/Editor/Api/UnityPackageUploader.cs
new file mode 100644
index 0000000..443a802
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/UnityPackageUploader.cs
@@ -0,0 +1,99 @@
+using AssetStoreTools.Api.Responses;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace AssetStoreTools.Api
+{
+    internal class UnityPackageUploadSettings
+    {
+        public string VersionId { get; set; }
+        public string UnityPackagePath { get; set; }
+        public string RootGuid { get; set; }
+        public string RootPath { get; set; }
+        public string ProjectPath { get; set; }
+    }
+
+    internal class UnityPackageUploader : PackageUploaderBase
+    {
+        private UnityPackageUploadSettings _settings;
+        private Uri _uploadUri;
+
+        public UnityPackageUploader(UnityPackageUploadSettings settings)
+        {
+            _settings = settings;
+        }
+
+        protected override void ValidateSettings()
+        {
+            if (string.IsNullOrEmpty(_settings.VersionId))
+                throw new Exception("Version Id is unset");
+
+            if (string.IsNullOrEmpty(_settings.UnityPackagePath)
+                || !File.Exists(_settings.UnityPackagePath))
+                throw new Exception("Package file could not be found");
+
+            if (!_settings.UnityPackagePath.EndsWith(".unitypackage"))
+                throw new Exception("Provided package file is not .unitypackage");
+        }
+
+        public override async Task<PackageUploadResponse> Upload(IAssetStoreClient client, IProgress<float> progress = null, CancellationToken cancellationToken = default)
+        {
+            try
+            {
+                ValidateSettings();
+
+                var endpoint = Constants.Api.UploadUnityPackageUrl(_settings.VersionId);
+                var query = new Dictionary<string, string>()
+                {
+                    { "root_guid", _settings.RootGuid },
+                    { "root_path", _settings.RootPath },
+                    { "project_path", _settings.ProjectPath }
+                };
+
+                _uploadUri = ApiUtility.CreateUri(endpoint, query, true);
+            }
+            catch (Exception e)
+            {
+                return new PackageUploadResponse() { Success = false, Status = UploadStatus.Fail, Exception = e };
+            }
+
+            return await Task.Run(() => UploadTask(client, progress, cancellationToken));
+        }
+
+        private PackageUploadResponse UploadTask(IAssetStoreClient client, IProgress<float> progress, CancellationToken cancellationToken)
+        {
+            try
+            {
+                using (FileStream requestFileStream = new FileStream(_settings.UnityPackagePath, FileMode.Open, FileAccess.Read))
+                {
+                    var content = new StreamContent(requestFileStream, UploadChunkSizeBytes);
+
+                    var response = client.Put(_uploadUri, content, cancellationToken);
+                    WaitForUploadCompletion(response, requestFileStream, progress, cancellationToken);
+
+                    cancellationToken.ThrowIfCancellationRequested();
+                    EnsureSuccessResponse(response.Result);
+
+                    var responseStr = response.Result.Content.ReadAsStringAsync().Result;
+                    return new PackageUploadResponse(responseStr);
+                }
+            }
+            catch (OperationCanceledException e)
+            {
+                return new PackageUploadResponse() { Success = false, Cancelled = true, Status = UploadStatus.Cancelled, Exception = e };
+            }
+            catch (TimeoutException e)
+            {
+                return new PackageUploadResponse() { Success = true, Status = UploadStatus.ResponseTimeout, Exception = e };
+            }
+            catch (Exception e)
+            {
+                return new PackageUploadResponse() { Success = false, Exception = e, Status = UploadStatus.Fail };
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/UnityPackageUploader.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Api/UnityPackageUploader.cs.meta
new file mode 100644
index 0000000..cdc262a
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/UnityPackageUploader.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 95bd0284375397f41a2065e07d4ba526
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Api/UnityPackageUploader.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/UploadStatus.cs b/Packages/com.unity.asset-store-tools/Editor/Api/UploadStatus.cs
new file mode 100644
index 0000000..3bcf97e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/UploadStatus.cs
@@ -0,0 +1,11 @@
+namespace AssetStoreTools.Api
+{
+    internal enum UploadStatus
+    {
+        Default = 0,
+        Success = 1,
+        Fail = 2,
+        Cancelled = 3,
+        ResponseTimeout = 4
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Api/UploadStatus.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Api/UploadStatus.cs.meta
new file mode 100644
index 0000000..83a0310
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Api/UploadStatus.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 0a121831a941cb64a8a9d21ca6fda9c3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Api/UploadStatus.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/AssemblyInfo.cs b/Packages/com.unity.asset-store-tools/Editor/AssemblyInfo.cs
new file mode 100644
index 0000000..8a39c59
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/AssemblyInfo.cs
@@ -0,0 +1,5 @@
+using System.Runtime.CompilerServices;
+[assembly: InternalsVisibleTo("AssetStoreTools.Tests")]
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
+[assembly: InternalsVisibleTo("ab-builder")]
+[assembly: InternalsVisibleTo("Inspector-Editor")]
diff --git a/Packages/com.unity.asset-store-tools/Editor/AssemblyInfo.cs.meta b/Packages/com.unity.asset-store-tools/Editor/AssemblyInfo.cs.meta
new file mode 100644
index 0000000..e3d24b4
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/AssemblyInfo.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: ccfd7faf75ab3c74a98015e772288d86
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/AssemblyInfo.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/AssetStoreTools.cs b/Packages/com.unity.asset-store-tools/Editor/AssetStoreTools.cs
new file mode 100644
index 0000000..698f543
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/AssetStoreTools.cs
@@ -0,0 +1,82 @@
+using AssetStoreTools.Previews.Data;
+using AssetStoreTools.Previews.UI;
+using AssetStoreTools.Uploader;
+using AssetStoreTools.Utility;
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.UI;
+using System;
+using UnityEditor;
+using UnityEngine;
+
+namespace AssetStoreTools
+{
+    internal static class AssetStoreTools
+    {
+        [MenuItem("Tools/Asset Store/Uploader", false, 0)]
+        public static void ShowAssetStoreToolsUploader()
+        {
+            Type inspectorType = Type.GetType("UnityEditor.InspectorWindow,UnityEditor.dll");
+            var wnd = EditorWindow.GetWindow<UploaderWindow>(inspectorType);
+            wnd.Show();
+        }
+
+        [MenuItem("Tools/Asset Store/Validator", false, 1)]
+        public static void ShowAssetStoreToolsValidator()
+        {
+            Type inspectorType = Type.GetType("UnityEditor.InspectorWindow,UnityEditor.dll");
+            var wnd = EditorWindow.GetWindow<ValidatorWindow>(typeof(UploaderWindow), inspectorType);
+            wnd.Show();
+        }
+
+        public static void ShowAssetStoreToolsValidator(ValidationSettings settings, ValidationResult result)
+        {
+            ShowAssetStoreToolsValidator();
+            EditorWindow.GetWindow<ValidatorWindow>().Load(settings, result);
+        }
+
+        [MenuItem("Tools/Asset Store/Preview Generator", false, 2)]
+        public static void ShowAssetStoreToolsPreviewGenerator()
+        {
+            Type inspectorType = Type.GetType("UnityEditor.InspectorWindow,UnityEditor.dll");
+            var wnd = EditorWindow.GetWindow<PreviewGeneratorWindow>(inspectorType);
+            wnd.Show();
+        }
+
+        public static void ShowAssetStoreToolsPreviewGenerator(PreviewGenerationSettings settings)
+        {
+            ShowAssetStoreToolsPreviewGenerator();
+            EditorWindow.GetWindow<PreviewGeneratorWindow>().Load(settings);
+        }
+
+        [MenuItem("Tools/Asset Store/Publisher Portal", false, 20)]
+        public static void OpenPublisherPortal()
+        {
+            Application.OpenURL("https://publisher.unity.com/");
+        }
+
+        [MenuItem("Tools/Asset Store/Submission Guidelines", false, 21)]
+        public static void OpenSubmissionGuidelines()
+        {
+            Application.OpenURL("https://assetstore.unity.com/publishing/submission-guidelines/");
+        }
+
+        [MenuItem("Tools/Asset Store/Provide Feedback", false, 22)]
+        public static void OpenFeedback()
+        {
+            Application.OpenURL("https://forum.unity.com/threads/new-asset-store-tools-version-coming-july-20th-2022.1310939/");
+        }
+
+        [MenuItem("Tools/Asset Store/Check for Updates", false, 45)]
+        public static void OpenUpdateChecker()
+        {
+            var wnd = EditorWindow.GetWindowWithRect<ASToolsUpdater>(new Rect(Screen.width / 2, Screen.height / 2, 400, 150), true);
+            wnd.Show();
+        }
+
+        [MenuItem("Tools/Asset Store/Settings", false, 50)]
+        public static void OpenSettings()
+        {
+            ASToolsPreferencesProvider.OpenSettings();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/AssetStoreTools.cs.meta b/Packages/com.unity.asset-store-tools/Editor/AssetStoreTools.cs.meta
new file mode 100644
index 0000000..1d99f81
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/AssetStoreTools.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 6060eef206afc844caaa1732538e8890
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/AssetStoreTools.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/AssetStoreToolsWindow.cs b/Packages/com.unity.asset-store-tools/Editor/AssetStoreToolsWindow.cs
new file mode 100644
index 0000000..7dae26c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/AssetStoreToolsWindow.cs
@@ -0,0 +1,23 @@
+using UnityEditor;
+using UnityEngine;
+
+namespace AssetStoreTools
+{
+    internal abstract class AssetStoreToolsWindow : EditorWindow
+    {
+        protected abstract string WindowTitle { get; }
+
+        private void DefaultInit()
+        {
+            titleContent = new GUIContent(WindowTitle);
+            Init();
+        }
+
+        protected abstract void Init();
+
+        private void OnEnable()
+        {
+            DefaultInit();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/AssetStoreToolsWindow.cs.meta b/Packages/com.unity.asset-store-tools/Editor/AssetStoreToolsWindow.cs.meta
new file mode 100644
index 0000000..2dc3a12
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/AssetStoreToolsWindow.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: c1057a05baaa45942808573065c02a03
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/AssetStoreToolsWindow.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Constants.cs b/Packages/com.unity.asset-store-tools/Editor/Constants.cs
new file mode 100644
index 0000000..1f8bcf2
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Constants.cs
@@ -0,0 +1,178 @@
+using AssetStoreTools.Previews.Data;
+using System;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+using PackageInfo = UnityEditor.PackageManager.PackageInfo;
+
+namespace AssetStoreTools
+{
+    internal class Constants
+    {
+#if UNITY_EDITOR_OSX
+        public static readonly string UnityPath = System.IO.Path.Combine(EditorApplication.applicationPath, "Contents", "MacOS", "Unity");
+#else
+        public static readonly string UnityPath = EditorApplication.applicationPath;
+#endif
+        public static readonly string RootProjectPath = Application.dataPath.Substring(0, Application.dataPath.Length - "Assets".Length);
+
+        private static bool GetArgument(string argumentName, out string argumentValue)
+        {
+            argumentValue = string.Empty;
+            var args = Environment.GetCommandLineArgs();
+
+            for (int i = 0; i < args.Length; i++)
+            {
+                if (!args[i].Equals(argumentName, StringComparison.OrdinalIgnoreCase))
+                    continue;
+
+                if (i + 1 >= args.Length)
+                    return false;
+
+                argumentValue = args[i + 1];
+                break;
+            }
+
+            return !string.IsNullOrEmpty(argumentValue);
+        }
+
+        public class Api
+        {
+            public static readonly string ApiVersion = $"V{PackageInfo.FindForAssetPath("Packages/com.unity.asset-store-tools").version}";
+            public const string AssetStoreToolsLatestVersionUrl = "https://api.assetstore.unity3d.com/package/latest-version/115";
+
+            private const string AssetStoreBaseUrlDefault = "https://kharma.unity3d.com";
+            private const string AssetStoreBaseUrlOverrideArgument = "-assetStoreUrl";
+            public static readonly string AssetStoreBaseUrl = !GetArgument(AssetStoreBaseUrlOverrideArgument, out var overriddenUrl)
+                ? AssetStoreBaseUrlDefault
+                : overriddenUrl;
+
+            public static readonly string AuthenticateUrl = $"{AssetStoreBaseUrl}/login";
+            public static readonly string GetPackagesUrl = $"{AssetStoreBaseUrl}/api/asset-store-tools/metadata/0.json";
+            public static readonly string GetPackagesAdditionalDataUrl = $"{AssetStoreBaseUrl}/api/management/packages.json";
+            public static readonly string GetCategoriesUrl = $"{AssetStoreBaseUrl}/api/management/categories.json";
+
+            public static string GetPackageUploadedVersionsUrl(string packageId, string versionId) =>
+                $"{AssetStoreBaseUrl}/api/content/preview/{packageId}/{versionId}.json";
+            public static string UploadUnityPackageUrl(string versionId) =>
+                $"{AssetStoreBaseUrl}/api/asset-store-tools/package/{versionId}/unitypackage.json";
+
+            public static IDictionary<string, string> DefaultAssetStoreQuery()
+            {
+                var dict = new Dictionary<string, string>()
+                {
+                    { "unityversion", Application.unityVersion },
+                    { "toolversion", ApiVersion }
+                };
+                return dict;
+            }
+        }
+
+        public class Updater
+        {
+            public const string AssetStoreToolsUrl = "https://assetstore.unity.com/packages/tools/utilities/asset-store-publishing-tools-115";
+        }
+
+        public class Cache
+        {
+            public const string SessionTokenKey = "kharma.sessionid";
+            public const string TempCachePath = "Temp/AssetStoreToolsCache";
+            public const string PersistentCachePath = "Library/AssetStoreToolsCache";
+
+            public const string PackageDataFileName = "PackageMetadata.json";
+            public const string CategoryDataFile = "Categories.json";
+            public const string ValidationResultFile = "ValidationStateData.asset";
+
+            public static string PackageThumbnailFileName(string packageId) => $"{packageId}.png";
+            public static string WorkflowStateDataFileName(string packageId) => $"{packageId}-workflowStateData.asset";
+        }
+
+        public class Uploader
+        {
+            public const string MinRequiredUnitySupportVersion = "2021.3";
+            public const long MaxPackageSizeBytes = 6576668672; // 6 GB + 128MB of headroom
+            public const string AccountRegistrationUrl = "https://publisher.unity.com/access";
+            public const string AccountForgottenPasswordUrl = "https://id.unity.com/password/new";
+
+            public class Analytics
+            {
+                public const string VendorKey = "unity.assetStoreTools";
+                public const int MaxEventsPerHour = 20;
+                public const int MaxNumberOfElements = 1000;
+
+                public class AuthenticationAnalytics
+                {
+                    public const string EventName = "assetStoreToolsLogin";
+                    public const int EventVersion = 1;
+                }
+
+                public class PackageUploadAnalytics
+                {
+                    public const string EventName = "assetStoreTools";
+                    public const int EventVersion = 3;
+                }
+            }
+        }
+
+        public class Validator
+        {
+            public const string SubmissionGuidelinesUrl = "https://assetstore.unity.com/publishing/submission-guidelines#Overview";
+            public const string SupportTicketUrl = "https://support.unity.com/hc/en-us/requests/new?ticket_form_id=65905";
+
+            public class Tests
+            {
+                public const string TestDefinitionsPath = "Packages/com.unity.asset-store-tools/Editor/Validator/Tests";
+                public const string TestMethodsPath = "Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods";
+
+                public static readonly string GenericTestMethodsPath = $"{TestMethodsPath}/Generic";
+                public static readonly string UnityPackageTestMethodsPath = $"{TestMethodsPath}/UnityPackage";
+            }
+        }
+
+        public class Previews
+        {
+            public const string PreviewDatabaseFile = "PreviewDatabase.json";
+
+            public static readonly string DefaultOutputPath = $"{Cache.TempCachePath}/AssetPreviews";
+            public const FileNameFormat DefaultFileNameFormat = FileNameFormat.Guid;
+
+            public class Native
+            {
+                public static readonly string DefaultOutputPath = $"{Previews.DefaultOutputPath}/Native";
+                public const PreviewFormat DefaultFormat = PreviewFormat.PNG;
+                public const bool DefaultWaitForPreviews = true;
+                public const bool DefaultChunkedPreviewLoading = true;
+                public const int DefaultChunkSize = 100;
+            }
+
+            public class Custom
+            {
+                public static readonly string DefaultOutputPath = $"{Previews.DefaultOutputPath}/Custom";
+                public const PreviewFormat DefaultFormat = PreviewFormat.JPG;
+                public const int DefaultWidth = 300;
+                public const int DefaultHeight = 300;
+                public const int DefaultDepth = 32;
+
+                public const int DefaultNativeWidth = 900;
+                public const int DefaultNativeHeight = 900;
+
+                public static readonly Color DefaultAudioSampleColor = new Color(1f, 0.55f, 0);
+                public static readonly Color DefaultAudioBackgroundColor = new Color(0.32f, 0.32f, 0.32f);
+            }
+        }
+
+        public class WindowStyles
+        {
+            public const string UploaderStylesPath = "Packages/com.unity.asset-store-tools/Editor/Uploader/Styles";
+            public const string ValidatorStylesPath = "Packages/com.unity.asset-store-tools/Editor/Validator/Styles";
+            public const string ValidatorIconsPath = "Packages/com.unity.asset-store-tools/Editor/Validator/Icons";
+            public const string PreviewGeneratorStylesPath = "Packages/com.unity.asset-store-tools/Editor/Previews/Styles";
+            public const string UpdaterStylesPath = "Packages/com.unity.asset-store-tools/Editor/Utility/Styles/Updater";
+        }
+
+        public class Debug
+        {
+            public const string DebugModeKey = "ASTDebugMode";
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Constants.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Constants.cs.meta
new file mode 100644
index 0000000..9fa0657
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Constants.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: a4ee1f78505bda748ae24b3dfd2606ca
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Constants.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Exporter.meta b/Packages/com.unity.asset-store-tools/Editor/Exporter.meta
new file mode 100644
index 0000000..4e1143b
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Exporter.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5f5ca981958937a43997a9f365759edf
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Exporter/Abstractions.meta b/Packages/com.unity.asset-store-tools/Editor/Exporter/Abstractions.meta
new file mode 100644
index 0000000..ac18e6c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Exporter/Abstractions.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2072d354c04b19c48b22593536b3ebcf
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Exporter/Abstractions/IPackageExporter.cs b/Packages/com.unity.asset-store-tools/Editor/Exporter/Abstractions/IPackageExporter.cs
new file mode 100644
index 0000000..f82debe
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Exporter/Abstractions/IPackageExporter.cs
@@ -0,0 +1,11 @@
+using System.Threading.Tasks;
+
+namespace AssetStoreTools.Exporter
+{
+    internal interface IPackageExporter
+    {
+        PackageExporterSettings Settings { get; }
+
+        Task<PackageExporterResult> Export();
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Exporter/Abstractions/IPackageExporter.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Exporter/Abstractions/IPackageExporter.cs.meta
new file mode 100644
index 0000000..2285d4b
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Exporter/Abstractions/IPackageExporter.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 41bc3a111ed1fd64c8b9acef211d9e51
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Exporter/Abstractions/IPackageExporter.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Exporter/Abstractions/IPreviewInjector.cs b/Packages/com.unity.asset-store-tools/Editor/Exporter/Abstractions/IPreviewInjector.cs
new file mode 100644
index 0000000..137a629
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Exporter/Abstractions/IPreviewInjector.cs
@@ -0,0 +1,7 @@
+namespace AssetStoreTools.Exporter
+{
+    internal interface IPreviewInjector
+    {
+        void Inject(string temporaryPackagePath);
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Exporter/Abstractions/IPreviewInjector.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Exporter/Abstractions/IPreviewInjector.cs.meta
new file mode 100644
index 0000000..7f4182e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Exporter/Abstractions/IPreviewInjector.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: dcff58dc716351f43b2709cfacdfebba
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Exporter/Abstractions/IPreviewInjector.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Exporter/Abstractions/PackageExporterBase.cs b/Packages/com.unity.asset-store-tools/Editor/Exporter/Abstractions/PackageExporterBase.cs
new file mode 100644
index 0000000..d9061f5
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Exporter/Abstractions/PackageExporterBase.cs
@@ -0,0 +1,134 @@
+using AssetStoreTools.Utility;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using UnityEditor;
+
+namespace AssetStoreTools.Exporter
+{
+    internal abstract class PackageExporterBase : IPackageExporter
+    {
+        public PackageExporterSettings Settings { get; private set; }
+
+        public const string ProgressBarTitle = "Exporting Package";
+        public const string ProgressBarStepSavingAssets = "Saving Assets...";
+        public const string ProgressBarStepGatheringFiles = "Gathering files...";
+        public const string ProgressBarStepGeneratingPreviews = "Generating previews...";
+        public const string ProgressBarStepCompressingPackage = "Compressing package...";
+
+        private static readonly string[] PluginFolderExtensions = { "androidlib", "bundle", "plugin", "framework", "xcframework" };
+
+        public PackageExporterBase(PackageExporterSettings settings)
+        {
+            Settings = settings;
+        }
+
+        public async Task<PackageExporterResult> Export()
+        {
+            try
+            {
+                ValidateSettings();
+            }
+            catch (Exception e)
+            {
+                return new PackageExporterResult() { Success = false, Exception = e };
+            }
+
+            return await ExportImpl();
+        }
+
+        protected virtual void ValidateSettings()
+        {
+            if (Settings == null)
+                throw new ArgumentException("Settings cannot be null");
+
+            if (string.IsNullOrEmpty(Settings.OutputFilename))
+                throw new ArgumentException("Output path cannot be null");
+
+            if (Settings.OutputFilename.EndsWith("/") || Settings.OutputFilename.EndsWith("\\"))
+                throw new ArgumentException("Output path must be a valid filename and not end with a directory separator character");
+        }
+
+        protected abstract Task<PackageExporterResult> ExportImpl();
+
+        protected string[] GetAssetPaths(string rootPath)
+        {
+            // To-do: slight optimization is possible in the future by having a list of excluded folders/file extensions
+            List<string> paths = new List<string>();
+
+            // Add files within given directory
+            var filePaths = Directory.GetFiles(rootPath).Select(p => p.Replace('\\', '/')).ToArray();
+            paths.AddRange(filePaths);
+
+            // Add directories within given directory
+            var directoryPaths = Directory.GetDirectories(rootPath).Select(p => p.Replace('\\', '/')).ToArray();
+            foreach (var nestedDirectory in directoryPaths)
+                paths.AddRange(GetAssetPaths(nestedDirectory));
+
+            // Add the given directory itself if it is not empty
+            if (filePaths.Length > 0 || directoryPaths.Length > 0)
+                paths.Add(rootPath);
+
+            return paths.ToArray();
+        }
+
+        protected string GetAssetGuid(string assetPath, bool generateIfPlugin, bool scrapeFromMeta)
+        {
+            if (!FileUtility.ShouldHaveMeta(assetPath))
+                return string.Empty;
+
+            // Skip ProjectVersion.txt file specifically as it may introduce
+            // project compatibility issues when imported
+            if (string.Compare(assetPath, "ProjectSettings/ProjectVersion.txt", StringComparison.OrdinalIgnoreCase) == 0)
+                return string.Empty;
+
+            // Attempt retrieving guid from the Asset Database first
+            var guid = AssetDatabase.AssetPathToGUID(assetPath);
+            if (guid != string.Empty)
+                return guid;
+
+            // Some special folders (e.g. SomeName.framework) do not have meta files inside them.
+            // Their contents should be exported with any arbitrary GUID so that Unity Importer could pick them up
+            if (generateIfPlugin && PathBelongsToPlugin(assetPath))
+                return GUID.Generate().ToString();
+
+            // Files in hidden folders (e.g. Samples~) are not part of the Asset Database,
+            // therefore GUIDs need to be scraped from the .meta file.
+            // Note: only do this for non-native exporter since the native exporter
+            // will not be able to retrieve the asset path from a hidden folder
+            if (scrapeFromMeta)
+            {
+                var metaPath = $"{assetPath}.meta";
+
+                if (!File.Exists(metaPath))
+                    return string.Empty;
+
+                using (StreamReader reader = new StreamReader(metaPath))
+                {
+                    string line;
+                    while ((line = reader.ReadLine()) != string.Empty)
+                    {
+                        if (!line.StartsWith("guid:"))
+                            continue;
+                        var metaGuid = line.Substring("guid:".Length).Trim();
+                        return metaGuid;
+                    }
+                }
+            }
+
+            return string.Empty;
+        }
+
+        private bool PathBelongsToPlugin(string assetPath)
+        {
+            return PluginFolderExtensions.Any(extension => assetPath.ToLower().Contains($".{extension}/"));
+        }
+
+        protected virtual void PostExportCleanup()
+        {
+            EditorUtility.ClearProgressBar();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Exporter/Abstractions/PackageExporterBase.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Exporter/Abstractions/PackageExporterBase.cs.meta
new file mode 100644
index 0000000..da3072c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Exporter/Abstractions/PackageExporterBase.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: aab20a0b596e60b40b1f7f7e0f54858e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Exporter/Abstractions/PackageExporterBase.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Exporter/Abstractions/PackageExporterSettings.cs b/Packages/com.unity.asset-store-tools/Editor/Exporter/Abstractions/PackageExporterSettings.cs
new file mode 100644
index 0000000..a8edde1
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Exporter/Abstractions/PackageExporterSettings.cs
@@ -0,0 +1,7 @@
+namespace AssetStoreTools.Exporter
+{
+    internal abstract class PackageExporterSettings
+    {
+        public string OutputFilename;
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Exporter/Abstractions/PackageExporterSettings.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Exporter/Abstractions/PackageExporterSettings.cs.meta
new file mode 100644
index 0000000..d6041f4
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Exporter/Abstractions/PackageExporterSettings.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 82c350daaabdc784e95e09cdc8511e23
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Exporter/Abstractions/PackageExporterSettings.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Exporter/DefaultExporterSettings.cs b/Packages/com.unity.asset-store-tools/Editor/Exporter/DefaultExporterSettings.cs
new file mode 100644
index 0000000..99dfcf3
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Exporter/DefaultExporterSettings.cs
@@ -0,0 +1,11 @@
+using AssetStoreTools.Previews.Generators;
+
+namespace AssetStoreTools.Exporter
+{
+    internal class DefaultExporterSettings : PackageExporterSettings
+    {
+        public string[] ExportPaths;
+        public string[] Dependencies;
+        public IPreviewGenerator PreviewGenerator;
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Exporter/DefaultExporterSettings.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Exporter/DefaultExporterSettings.cs.meta
new file mode 100644
index 0000000..4f784d2
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Exporter/DefaultExporterSettings.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 92cbd0e60b4bb9049bcf1e9fd92ccae6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Exporter/DefaultExporterSettings.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Exporter/DefaultPackageExporter.cs b/Packages/com.unity.asset-store-tools/Editor/Exporter/DefaultPackageExporter.cs
new file mode 100644
index 0000000..ffe58ee
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Exporter/DefaultPackageExporter.cs
@@ -0,0 +1,304 @@
+using AssetStoreTools.Previews.Data;
+using AssetStoreTools.Utility;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using UnityEditor;
+using UnityEngine;
+using CacheConstants = AssetStoreTools.Constants.Cache;
+
+namespace AssetStoreTools.Exporter
+{
+    internal class DefaultPackageExporter : PackageExporterBase
+    {
+        private const string TemporaryExportPathName = "CustomExport";
+
+        private DefaultExporterSettings _defaultExportSettings;
+
+        public DefaultPackageExporter(DefaultExporterSettings settings) : base(settings)
+        {
+            _defaultExportSettings = settings;
+        }
+
+        protected override void ValidateSettings()
+        {
+            base.ValidateSettings();
+
+            if (_defaultExportSettings.ExportPaths == null || _defaultExportSettings.ExportPaths.Length == 0)
+                throw new ArgumentException("Export paths array cannot be empty");
+        }
+
+        protected override async Task<PackageExporterResult> ExportImpl()
+        {
+            return await this.Export();
+        }
+
+        private new async Task<PackageExporterResult> Export()
+        {
+            ASDebug.Log("Using custom package exporter");
+
+            // Save assets before exporting
+            EditorUtility.DisplayProgressBar(ProgressBarTitle, ProgressBarStepSavingAssets, 0.1f);
+            AssetDatabase.SaveAssets();
+
+            try
+            {
+                // Create a temporary export path
+                PostExportCleanup();
+                var temporaryExportPath = GetTemporaryExportPath();
+                if (!Directory.Exists(temporaryExportPath))
+                    Directory.CreateDirectory(temporaryExportPath);
+
+                // Construct an unzipped package structure
+                CreateTempPackageStructure(temporaryExportPath);
+
+                var previewGenerationResult = await GeneratePreviews();
+                InjectPreviews(previewGenerationResult, temporaryExportPath);
+
+                // Build a .unitypackage file from the temporary folder
+                CreateUnityPackage(temporaryExportPath, _defaultExportSettings.OutputFilename);
+
+                EditorUtility.RevealInFinder(_defaultExportSettings.OutputFilename);
+
+                ASDebug.Log($"Package file has been created at {_defaultExportSettings.OutputFilename}");
+                return new PackageExporterResult() { Success = true, ExportedPath = _defaultExportSettings.OutputFilename, PreviewGenerationResult = previewGenerationResult };
+            }
+            catch (Exception e)
+            {
+                return new PackageExporterResult() { Success = false, Exception = e };
+            }
+            finally
+            {
+                PostExportCleanup();
+            }
+        }
+
+        private string GetTemporaryExportPath()
+        {
+            return $"{CacheConstants.TempCachePath}/{TemporaryExportPathName}";
+        }
+
+        private void CreateTempPackageStructure(string tempOutputPath)
+        {
+            EditorUtility.DisplayProgressBar(ProgressBarTitle, ProgressBarStepGatheringFiles, 0.4f);
+            var pathGuidPairs = GetPathGuidPairs(_defaultExportSettings.ExportPaths);
+
+            foreach (var pair in pathGuidPairs)
+            {
+                var originalAssetPath = pair.Key;
+                var outputAssetPath = $"{tempOutputPath}/{pair.Value}";
+
+                if (Directory.Exists(outputAssetPath))
+                {
+                    var path1 = File.ReadAllText($"{outputAssetPath}/pathname");
+                    var path2 = originalAssetPath;
+                    throw new InvalidOperationException($"Multiple assets with guid {pair.Value} have been detected " +
+                        $"when exporting the package. Please resolve the guid conflicts and try again:\n{path1}\n{path2}");
+                }
+
+                Directory.CreateDirectory(outputAssetPath);
+
+                // Every exported asset has a pathname file
+                using (StreamWriter writer = new StreamWriter($"{outputAssetPath}/pathname"))
+                    writer.Write(originalAssetPath);
+
+                // Only files (not folders) have an asset file
+                if (File.Exists(originalAssetPath))
+                    File.Copy(originalAssetPath, $"{outputAssetPath}/asset");
+
+                // Most files and folders have an asset.meta file (but ProjectSettings folder assets do not)
+                if (File.Exists($"{originalAssetPath}.meta"))
+                    File.Copy($"{originalAssetPath}.meta", $"{outputAssetPath}/asset.meta");
+
+                // To-do: handle previews in hidden folders as they are not part of the AssetDatabase
+                var previewObject = AssetDatabase.LoadAssetAtPath<UnityEngine.Object>(originalAssetPath);
+                if (previewObject == null)
+                    continue;
+            }
+
+            if (_defaultExportSettings.Dependencies == null || _defaultExportSettings.Dependencies.Length == 0)
+                return;
+
+            var exportDependenciesDict = new JObject();
+            var allRegistryPackages = PackageUtility.GetAllRegistryPackages();
+
+            foreach (var exportDependency in _defaultExportSettings.Dependencies)
+            {
+                var registryPackage = allRegistryPackages.FirstOrDefault(x => x.name == exportDependency);
+                if (registryPackage == null)
+                {
+                    // Package is either not from a registry source or does not exist in the project
+                    UnityEngine.Debug.LogWarning($"Found an unsupported Package Manager dependency: {exportDependency}.\n" +
+                                             "This dependency is not supported in the project's manifest.json and will be skipped.");
+                    continue;
+                }
+
+                exportDependenciesDict[registryPackage.name] = registryPackage.version;
+            }
+
+            if (exportDependenciesDict.Count == 0)
+                return;
+
+            var exportManifestJson = new JObject();
+            exportManifestJson["dependencies"] = exportDependenciesDict;
+
+            var tempManifestDirectoryPath = $"{tempOutputPath}/packagemanagermanifest";
+            Directory.CreateDirectory(tempManifestDirectoryPath);
+            var tempManifestFilePath = $"{tempManifestDirectoryPath}/asset";
+
+            File.WriteAllText(tempManifestFilePath, exportManifestJson.ToString());
+        }
+
+        private Dictionary<string, string> GetPathGuidPairs(string[] exportPaths)
+        {
+            var pathGuidPairs = new Dictionary<string, string>();
+
+            foreach (var exportPath in exportPaths)
+            {
+                var assetPaths = GetAssetPaths(exportPath);
+
+                foreach (var assetPath in assetPaths)
+                {
+                    var guid = GetAssetGuid(assetPath, true, true);
+                    if (string.IsNullOrEmpty(guid))
+                        continue;
+
+                    pathGuidPairs.Add(assetPath, guid);
+                }
+            }
+
+            return pathGuidPairs;
+        }
+
+        private async Task<PreviewGenerationResult> GeneratePreviews()
+        {
+            if (_defaultExportSettings.PreviewGenerator == null)
+                return null;
+
+            void ReportProgress(float progress)
+            {
+                EditorUtility.DisplayProgressBar(ProgressBarTitle, ProgressBarStepGeneratingPreviews, progress);
+            }
+
+            _defaultExportSettings.PreviewGenerator.OnProgressChanged += ReportProgress;
+            var result = await _defaultExportSettings.PreviewGenerator.Generate();
+            _defaultExportSettings.PreviewGenerator.OnProgressChanged -= ReportProgress;
+            EditorUtility.ClearProgressBar();
+
+            if (!result.Success)
+            {
+                UnityEngine.Debug.LogWarning($"An error was encountered while generating previews. Exported package may be missing previews.\n{result.Exception}");
+            }
+
+            return result;
+        }
+
+        private void InjectPreviews(PreviewGenerationResult result, string temporaryExportPath)
+        {
+            if (result == null || !result.Success)
+                return;
+
+            var injector = new PreviewInjector(result);
+            injector.Inject(temporaryExportPath);
+        }
+
+        private void CreateUnityPackage(string pathToArchive, string outputPath)
+        {
+            if (Directory.GetDirectories(pathToArchive).Length == 0)
+                throw new InvalidOperationException("Unable to export package. The specified path is empty");
+
+            EditorUtility.DisplayProgressBar(ProgressBarTitle, ProgressBarStepCompressingPackage, 0.8f);
+
+            // Archiving process working path will be set to the
+            // temporary package path so adjust the output path accordingly
+            if (!Path.IsPathRooted(outputPath))
+                outputPath = $"{Application.dataPath.Substring(0, Application.dataPath.Length - "/Assets".Length)}/{outputPath}";
+
+#if UNITY_EDITOR_WIN
+            CreateUnityPackageUniversal(pathToArchive, outputPath);
+#elif UNITY_EDITOR_OSX || UNITY_EDITOR_LINUX
+            CreateUnityPackageOsxLinux(pathToArchive, outputPath);
+#endif
+        }
+
+        private void CreateUnityPackageUniversal(string pathToArchive, string outputPath)
+        {
+            var _7zPath = EditorApplication.applicationContentsPath;
+#if UNITY_EDITOR_WIN
+            _7zPath = Path.Combine(_7zPath, "Tools", "7z.exe");
+#elif UNITY_EDITOR_OSX || UNITY_EDITOR_LINUX
+            _7zPath = Path.Combine(_7zPath, "Tools", "7za");
+#endif
+            if (!File.Exists(_7zPath))
+                throw new FileNotFoundException("Archiving utility was not found in your Unity installation directory");
+
+            var argumentsTar = $"a -r -ttar -y -bd archtemp.tar .";
+            var result = StartProcess(_7zPath, argumentsTar, pathToArchive);
+            if (result != 0)
+                throw new Exception("Failed to compress the package");
+
+            // Create a GZIP archive
+            var argumentsGzip = $"a -tgzip -bd -y \"{outputPath}\" archtemp.tar";
+            result = StartProcess(_7zPath, argumentsGzip, pathToArchive);
+            if (result != 0)
+                throw new Exception("Failed to compress the package");
+        }
+
+#if UNITY_EDITOR_OSX || UNITY_EDITOR_LINUX
+        private void CreateUnityPackageOsxLinux(string pathToArchive, string outputPath)
+        {
+            var tarPath = "/usr/bin/tar";
+
+            if (!File.Exists(tarPath))
+            {
+                // Fallback to the universal export method
+                ASDebug.LogWarning("'/usr/bin/tar' executable not found. Falling back to 7za");
+                CreateUnityPackageUniversal(pathToArchive, outputPath);
+                return;
+            }
+
+            // Create a TAR archive
+            var arguments = $"-czpf \"{outputPath}\" .";
+            var result = StartProcess(tarPath, arguments, pathToArchive);
+            if (result != 0)
+                throw new Exception("Failed to compress the package");
+        }
+#endif
+
+        private int StartProcess(string processPath, string arguments, string workingDirectory)
+        {
+            var info = new ProcessStartInfo()
+            {
+                FileName = processPath,
+                Arguments = arguments,
+                WorkingDirectory = workingDirectory,
+                CreateNoWindow = true,
+                UseShellExecute = false
+            };
+
+#if UNITY_EDITOR_OSX
+            // Prevent OSX-specific archive pollution
+            info.EnvironmentVariables.Add("COPYFILE_DISABLE", "1");
+#endif
+
+            using (Process process = Process.Start(info))
+            {
+                process.WaitForExit();
+                return process.ExitCode;
+            }
+        }
+
+        protected override void PostExportCleanup()
+        {
+            base.PostExportCleanup();
+
+            var tempExportPath = GetTemporaryExportPath();
+            if (Directory.Exists(tempExportPath))
+                Directory.Delete(tempExportPath, true);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Exporter/DefaultPackageExporter.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Exporter/DefaultPackageExporter.cs.meta
new file mode 100644
index 0000000..7623320
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Exporter/DefaultPackageExporter.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 32f50122a1b2bc2428cf8fba321e2414
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Exporter/DefaultPackageExporter.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Exporter/LegacyExporterSettings.cs b/Packages/com.unity.asset-store-tools/Editor/Exporter/LegacyExporterSettings.cs
new file mode 100644
index 0000000..89fd6ee
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Exporter/LegacyExporterSettings.cs
@@ -0,0 +1,8 @@
+namespace AssetStoreTools.Exporter
+{
+    internal class LegacyExporterSettings : PackageExporterSettings
+    {
+        public string[] ExportPaths;
+        public bool IncludeDependencies;
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Exporter/LegacyExporterSettings.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Exporter/LegacyExporterSettings.cs.meta
new file mode 100644
index 0000000..e87e08c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Exporter/LegacyExporterSettings.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: c7dea1cfe45989e4eab6fc5fd18c1e10
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Exporter/LegacyExporterSettings.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Exporter/LegacyPackageExporter.cs b/Packages/com.unity.asset-store-tools/Editor/Exporter/LegacyPackageExporter.cs
new file mode 100644
index 0000000..434af23
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Exporter/LegacyPackageExporter.cs
@@ -0,0 +1,109 @@
+using AssetStoreTools.Utility;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace AssetStoreTools.Exporter
+{
+    internal class LegacyPackageExporter : PackageExporterBase
+    {
+        private const string ExportMethodWithoutDependencies = "UnityEditor.PackageUtility.ExportPackage";
+        private const string ExportMethodWithDependencies = "UnityEditor.PackageUtility.ExportPackageAndPackageManagerManifest";
+
+        private LegacyExporterSettings _legacyExportSettings;
+
+        public LegacyPackageExporter(LegacyExporterSettings settings) : base(settings)
+        {
+            _legacyExportSettings = settings;
+        }
+
+        protected override void ValidateSettings()
+        {
+            base.ValidateSettings();
+
+            if (_legacyExportSettings.ExportPaths == null || _legacyExportSettings.ExportPaths.Length == 0)
+                throw new ArgumentException("Export paths array cannot be empty");
+        }
+
+        protected override async Task<PackageExporterResult> ExportImpl()
+        {
+            return await this.Export();
+        }
+
+        private async new Task<PackageExporterResult> Export()
+        {
+            ASDebug.Log("Using native package exporter");
+
+            try
+            {
+                var guids = GetGuids(_legacyExportSettings.ExportPaths, out bool onlyFolders);
+
+                if (guids.Length == 0 || onlyFolders)
+                    throw new ArgumentException("Package Exporting failed: provided export paths are empty or only contain empty folders");
+
+                string exportMethod = ExportMethodWithoutDependencies;
+                if (_legacyExportSettings.IncludeDependencies)
+                    exportMethod = ExportMethodWithDependencies;
+
+                var split = exportMethod.Split('.');
+                var assembly = Assembly.Load(split[0]); // UnityEditor
+                var typeName = $"{split[0]}.{split[1]}"; // UnityEditor.PackageUtility
+                var methodName = split[2]; // ExportPackage or ExportPackageAndPackageManagerManifest
+
+                var type = assembly.GetType(typeName);
+                var method = type.GetMethod(methodName, BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public,
+                    null, new Type[] { typeof(string[]), typeof(string) }, null);
+
+                ASDebug.Log("Invoking native export method");
+
+                method?.Invoke(null, new object[] { guids, _legacyExportSettings.OutputFilename });
+
+                // The internal exporter methods are asynchronous, therefore
+                // we need to wait for exporting to finish before returning
+                await Task.Run(() =>
+                {
+                    while (!File.Exists(_legacyExportSettings.OutputFilename))
+                        Thread.Sleep(100);
+                });
+
+                ASDebug.Log($"Package file has been created at {_legacyExportSettings.OutputFilename}");
+                return new PackageExporterResult() { Success = true, ExportedPath = _legacyExportSettings.OutputFilename };
+            }
+            catch (Exception e)
+            {
+                return new PackageExporterResult() { Success = false, Exception = e };
+            }
+            finally
+            {
+                PostExportCleanup();
+            }
+        }
+
+        private string[] GetGuids(string[] exportPaths, out bool onlyFolders)
+        {
+            var guids = new List<string>();
+            onlyFolders = true;
+
+            foreach (var exportPath in exportPaths)
+            {
+                var assetPaths = GetAssetPaths(exportPath);
+
+                foreach (var assetPath in assetPaths)
+                {
+                    var guid = GetAssetGuid(assetPath, false, false);
+                    if (string.IsNullOrEmpty(guid))
+                        continue;
+
+                    guids.Add(guid);
+                    if (onlyFolders == true && (File.Exists(assetPath)))
+                        onlyFolders = false;
+                }
+            }
+
+            return guids.ToArray();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Exporter/LegacyPackageExporter.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Exporter/LegacyPackageExporter.cs.meta
new file mode 100644
index 0000000..61f2057
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Exporter/LegacyPackageExporter.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 3200380dff2de104aa79620e4b41dc70
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Exporter/LegacyPackageExporter.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Exporter/PackageExporterResult.cs b/Packages/com.unity.asset-store-tools/Editor/Exporter/PackageExporterResult.cs
new file mode 100644
index 0000000..cd45944
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Exporter/PackageExporterResult.cs
@@ -0,0 +1,13 @@
+using AssetStoreTools.Previews.Data;
+using System;
+
+namespace AssetStoreTools.Exporter
+{
+    internal class PackageExporterResult
+    {
+        public bool Success;
+        public string ExportedPath;
+        public PreviewGenerationResult PreviewGenerationResult;
+        public Exception Exception;
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Exporter/PackageExporterResult.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Exporter/PackageExporterResult.cs.meta
new file mode 100644
index 0000000..549deb0
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Exporter/PackageExporterResult.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: e685b1c322eab4540919d4fc970e812d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Exporter/PackageExporterResult.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Exporter/PreviewInjector.cs b/Packages/com.unity.asset-store-tools/Editor/Exporter/PreviewInjector.cs
new file mode 100644
index 0000000..7fb82b2
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Exporter/PreviewInjector.cs
@@ -0,0 +1,41 @@
+using AssetStoreTools.Previews.Data;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+namespace AssetStoreTools.Exporter
+{
+    internal class PreviewInjector : IPreviewInjector
+    {
+        private PreviewGenerationResult _result;
+
+        public PreviewInjector(PreviewGenerationResult result)
+        {
+            _result = result;
+        }
+
+        public void Inject(string temporaryPackagePath)
+        {
+            if (_result == null || !_result.Success)
+                return;
+
+            var previews = _result.Previews.Where(x => x.Type == _result.GenerationType && x.Exists());
+            InjectFilesIntoGuidFolders(previews, temporaryPackagePath);
+        }
+
+        private void InjectFilesIntoGuidFolders(IEnumerable<PreviewMetadata> previews, string temporaryPackagePath)
+        {
+            foreach (var assetFolder in Directory.EnumerateDirectories(temporaryPackagePath))
+            {
+                var guid = assetFolder.Replace("\\", "/").Split('/').Last();
+                var generatedPreview = previews.FirstOrDefault(x => x.Guid.Equals(guid));
+
+                if (generatedPreview == null)
+                    continue;
+
+                // Note: Unity Importer and Asset Store only operate with .png extensions
+                File.Copy(generatedPreview.Path, $"{assetFolder}/preview.png", true);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Exporter/PreviewInjector.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Exporter/PreviewInjector.cs.meta
new file mode 100644
index 0000000..1f7fe2e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Exporter/PreviewInjector.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 772db784128e32d4792bb680258c71df
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Exporter/PreviewInjector.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews.meta b/Packages/com.unity.asset-store-tools/Editor/Previews.meta
new file mode 100644
index 0000000..747d5eb
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 13e8cd63112e52d43a7e65949f0143a4
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts.meta
new file mode 100644
index 0000000..f95e49f
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cbe1aebea6551424997b361fab69f266
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data.meta
new file mode 100644
index 0000000..89f1356
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ae99e2e3b5a83d1469110306c96f4c58
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/CustomPreviewGenerationSettings.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/CustomPreviewGenerationSettings.cs
new file mode 100644
index 0000000..07e9ad8
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/CustomPreviewGenerationSettings.cs
@@ -0,0 +1,19 @@
+using UnityEngine;
+
+namespace AssetStoreTools.Previews.Data
+{
+    internal class CustomPreviewGenerationSettings : PreviewGenerationSettings
+    {
+        public override GenerationType GenerationType => GenerationType.Custom;
+
+        public int Width;
+        public int Height;
+        public int Depth;
+
+        public int NativeWidth;
+        public int NativeHeight;
+
+        public Color AudioSampleColor;
+        public Color AudioBackgroundColor;
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/CustomPreviewGenerationSettings.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/CustomPreviewGenerationSettings.cs.meta
new file mode 100644
index 0000000..027edf9
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/CustomPreviewGenerationSettings.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 2ccb1292c1c4ba94cb6f4022ecfdfa50
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/CustomPreviewGenerationSettings.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/FileNameFormat.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/FileNameFormat.cs
new file mode 100644
index 0000000..fab2e5b
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/FileNameFormat.cs
@@ -0,0 +1,9 @@
+namespace AssetStoreTools.Previews.Data
+{
+    internal enum FileNameFormat
+    {
+        Guid = 0,
+        FullAssetPath = 1,
+        AssetName = 2,
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/FileNameFormat.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/FileNameFormat.cs.meta
new file mode 100644
index 0000000..4806598
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/FileNameFormat.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 38a1babecfeaf524f98e8d67882acf48
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/FileNameFormat.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/GenerationType.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/GenerationType.cs
new file mode 100644
index 0000000..9ee1cb5
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/GenerationType.cs
@@ -0,0 +1,9 @@
+namespace AssetStoreTools.Previews.Data
+{
+    internal enum GenerationType
+    {
+        Unknown = 0,
+        Native = 1,
+        Custom = 2
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/GenerationType.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/GenerationType.cs.meta
new file mode 100644
index 0000000..310ce82
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/GenerationType.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 66697a5d16404d948ba3191ddfc60bd9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/GenerationType.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/NativePreviewGenerationSettings.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/NativePreviewGenerationSettings.cs
new file mode 100644
index 0000000..183da57
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/NativePreviewGenerationSettings.cs
@@ -0,0 +1,10 @@
+namespace AssetStoreTools.Previews.Data
+{
+    internal class NativePreviewGenerationSettings : PreviewGenerationSettings
+    {
+        public override GenerationType GenerationType => GenerationType.Native;
+        public bool WaitForPreviews;
+        public bool ChunkedPreviewLoading;
+        public int ChunkSize;
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/NativePreviewGenerationSettings.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/NativePreviewGenerationSettings.cs.meta
new file mode 100644
index 0000000..a6119ea
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/NativePreviewGenerationSettings.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 5b2ef019acae6fe43b5565858e15433a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/NativePreviewGenerationSettings.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewDatabase.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewDatabase.cs
new file mode 100644
index 0000000..dce6051
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewDatabase.cs
@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+
+namespace AssetStoreTools.Previews.Data
+{
+    internal class PreviewDatabase
+    {
+        public List<PreviewMetadata> Previews;
+
+        public PreviewDatabase()
+        {
+            Previews = new List<PreviewMetadata>();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewDatabase.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewDatabase.cs.meta
new file mode 100644
index 0000000..4305540
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewDatabase.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: cf8cef28a68324742a7e4b47efc87563
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewDatabase.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewFormat.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewFormat.cs
new file mode 100644
index 0000000..9f02cf9
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewFormat.cs
@@ -0,0 +1,8 @@
+namespace AssetStoreTools.Previews.Data
+{
+    internal enum PreviewFormat
+    {
+        JPG = 0,
+        PNG = 1
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewFormat.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewFormat.cs.meta
new file mode 100644
index 0000000..2ffac1d
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewFormat.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 0500e4459ebfe8448a13194af49f89fa
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewFormat.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewGenerationResult.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewGenerationResult.cs
new file mode 100644
index 0000000..82fbb93
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewGenerationResult.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+
+namespace AssetStoreTools.Previews.Data
+{
+    internal class PreviewGenerationResult
+    {
+        public GenerationType GenerationType;
+        public bool Success;
+        public IEnumerable<PreviewMetadata> GeneratedPreviews;
+        public IEnumerable<PreviewMetadata> Previews;
+        public Exception Exception;
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewGenerationResult.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewGenerationResult.cs.meta
new file mode 100644
index 0000000..22f1136
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewGenerationResult.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: e040f2cdf0177824dacb158b23a63374
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewGenerationResult.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewGenerationSettings.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewGenerationSettings.cs
new file mode 100644
index 0000000..c11b74f
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewGenerationSettings.cs
@@ -0,0 +1,12 @@
+namespace AssetStoreTools.Previews.Data
+{
+    internal abstract class PreviewGenerationSettings
+    {
+        public abstract GenerationType GenerationType { get; }
+        public string[] InputPaths;
+        public string OutputPath;
+        public PreviewFormat Format;
+        public FileNameFormat PreviewFileNamingFormat;
+        public bool OverwriteExisting;
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewGenerationSettings.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewGenerationSettings.cs.meta
new file mode 100644
index 0000000..30ef418
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewGenerationSettings.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 7e578ae6616505a4795da8f632d63229
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewGenerationSettings.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewMetadata.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewMetadata.cs
new file mode 100644
index 0000000..e828fbf
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewMetadata.cs
@@ -0,0 +1,17 @@
+using System.IO;
+
+namespace AssetStoreTools.Previews.Data
+{
+    internal class PreviewMetadata
+    {
+        public GenerationType Type;
+        public string Guid;
+        public string Name;
+        public string Path;
+
+        public bool Exists()
+        {
+            return File.Exists(Path);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewMetadata.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewMetadata.cs.meta
new file mode 100644
index 0000000..437956a
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewMetadata.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 4ff6be4e277d8314e921baff52ea25bc
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Data/PreviewMetadata.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators.meta
new file mode 100644
index 0000000..7019d5c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ed651159a2004574789e97726da5090c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom.meta
new file mode 100644
index 0000000..cac3d99
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f675855c3d971694785806c0c7a463be
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/AudioChannel.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/AudioChannel.cs
new file mode 100644
index 0000000..1e2d4aa
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/AudioChannel.cs
@@ -0,0 +1,97 @@
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+
+namespace AssetStoreTools.Previews.Generators.Custom
+{
+    internal class AudioChannel
+    {
+        private int _yMin;
+        private int _yMax;
+
+        private int _yBaseline;
+        private int _yAmplitude;
+
+        private List<float> _samples;
+
+        public AudioChannel(int minY, int maxY, List<float> samples)
+        {
+            _yMin = minY;
+            _yMax = maxY;
+
+            _yBaseline = (_yMin + _yMax) / 2;
+            _yAmplitude = _yMax - _yBaseline;
+
+            _samples = samples;
+        }
+
+        public IEnumerable<AudioChannelCoordinate> GetCoordinateData(int desiredWidth)
+        {
+            var coordinates = new List<AudioChannelCoordinate>();
+            var step = Mathf.RoundToInt((float)_samples.Count / desiredWidth);
+
+            for (int i = 0; i < desiredWidth; i++)
+            {
+                var startIndex = i * step;
+                var endIndex = (i + 1) * step;
+                var sampleChunk = CreateChunk(startIndex, endIndex);
+
+                if (sampleChunk.Count() == 0)
+                    break;
+
+                DownsampleMax(sampleChunk, out var aboveBaseline, out var belowBaseline);
+
+                var yAboveBaseline = SampleToCoordinate(aboveBaseline);
+                var yBelowBaseline = SampleToCoordinate(belowBaseline);
+
+                coordinates.Add(new AudioChannelCoordinate(i, _yBaseline, yAboveBaseline, yBelowBaseline));
+            }
+
+            // If there weren't enough samples to complete the desired width - fill out the rest with zeroes
+            for (int i = coordinates.Count; i < desiredWidth; i++)
+                coordinates.Add(new AudioChannelCoordinate(i, _yBaseline, 0, 0));
+
+            return coordinates;
+        }
+
+        private IEnumerable<float> CreateChunk(int startIndex, int endIndex)
+        {
+            var chunk = new List<float>();
+            for (int i = startIndex; i < endIndex; i++)
+            {
+                if (i >= _samples.Count)
+                    break;
+
+                chunk.Add(_samples[i]);
+            }
+
+            return chunk;
+        }
+
+        private void DownsampleMax(IEnumerable<float> samples, out float valueAboveBaseline, out float valueBelowBaseline)
+        {
+            valueAboveBaseline = 0;
+            valueBelowBaseline = 0;
+
+            foreach (var sample in samples)
+            {
+                if (sample > 0 && sample > valueAboveBaseline)
+                {
+                    valueAboveBaseline = sample;
+                    continue;
+                }
+
+                if (sample < 0 && sample < valueBelowBaseline)
+                {
+                    valueBelowBaseline = sample;
+                    continue;
+                }
+            }
+        }
+
+        private int SampleToCoordinate(float sample)
+        {
+            return _yBaseline + (int)(sample * _yAmplitude);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/AudioChannel.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/AudioChannel.cs.meta
new file mode 100644
index 0000000..dbbceb3
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/AudioChannel.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 82fab55b08a1be94cb2e18f3feae91ec
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/AudioChannel.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/AudioChannelCoordinate.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/AudioChannelCoordinate.cs
new file mode 100644
index 0000000..c501b07
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/AudioChannelCoordinate.cs
@@ -0,0 +1,18 @@
+namespace AssetStoreTools.Previews.Generators.Custom
+{
+    internal struct AudioChannelCoordinate
+    {
+        public int X { get; private set; }
+        public int YBaseline { get; private set; }
+        public int YAboveBaseline { get; private set; }
+        public int YBelowBaseline { get; private set; }
+
+        public AudioChannelCoordinate(int x, int yBaseline, int yAboveBaseline, int yBelowBaseline)
+        {
+            X = x;
+            YBaseline = yBaseline;
+            YAboveBaseline = yAboveBaseline;
+            YBelowBaseline = yBelowBaseline;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/AudioChannelCoordinate.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/AudioChannelCoordinate.cs.meta
new file mode 100644
index 0000000..5c41aae
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/AudioChannelCoordinate.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: b54462f6af82a2644944d6e4bde23c9e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/AudioChannelCoordinate.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters.meta
new file mode 100644
index 0000000..91cfc9f
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c07070deed666d54cb72a89a5fcd7ef7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/ISceneScreenshotter.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/ISceneScreenshotter.cs
new file mode 100644
index 0000000..22c8f34
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/ISceneScreenshotter.cs
@@ -0,0 +1,12 @@
+using UnityEngine;
+
+namespace AssetStoreTools.Previews.Generators.Custom.Screenshotters
+{
+    internal interface ISceneScreenshotter
+    {
+        SceneScreenshotterSettings Settings { get; }
+
+        string Screenshot(string outputPath);
+        string Screenshot(GameObject target, string outputPath);
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/ISceneScreenshotter.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/ISceneScreenshotter.cs.meta
new file mode 100644
index 0000000..103f3a0
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/ISceneScreenshotter.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 045ac265a792af243918af0849ee2ac8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/ISceneScreenshotter.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/MaterialScreenshotter.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/MaterialScreenshotter.cs
new file mode 100644
index 0000000..a45917c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/MaterialScreenshotter.cs
@@ -0,0 +1,32 @@
+using UnityEngine;
+
+namespace AssetStoreTools.Previews.Generators.Custom.Screenshotters
+{
+    internal class MaterialScreenshotter : SceneScreenshotterBase
+    {
+        public MaterialScreenshotter(SceneScreenshotterSettings settings) : base(settings) { }
+
+        public override void PositionCamera(GameObject target)
+        {
+            var renderers = target.GetComponentsInChildren<Renderer>();
+            if (renderers == null || renderers.Length == 0)
+                return;
+
+            var bounds = GetGlobalBounds(renderers);
+
+            var materialSphereRadius = bounds.extents.y * 1.1f;
+
+            var angle = Camera.fieldOfView / 2;
+            var sinAngle = Mathf.Sin(angle * Mathf.Deg2Rad);
+            var distance = materialSphereRadius / sinAngle;
+
+            Camera.transform.position = new Vector3(bounds.center.x, bounds.center.y + distance, bounds.center.z);
+            Camera.transform.LookAt(bounds.center);
+            Camera.transform.RotateAround(bounds.center, Vector3.left, 60);
+            Camera.transform.RotateAround(bounds.center, Vector3.up, -45);
+
+            Camera.nearClipPlane = 0.01f;
+            Camera.farClipPlane = 10000;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/MaterialScreenshotter.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/MaterialScreenshotter.cs.meta
new file mode 100644
index 0000000..fc8ef16
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/MaterialScreenshotter.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: c2bd7b01b0cebeb43a6fbc53377f0ea6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/MaterialScreenshotter.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/MeshScreenshotter.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/MeshScreenshotter.cs
new file mode 100644
index 0000000..51ce5d0
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/MeshScreenshotter.cs
@@ -0,0 +1,33 @@
+using UnityEngine;
+
+namespace AssetStoreTools.Previews.Generators.Custom.Screenshotters
+{
+    internal class MeshScreenshotter : SceneScreenshotterBase
+    {
+        public MeshScreenshotter(SceneScreenshotterSettings settings) : base(settings) { }
+
+        public override void PositionCamera(GameObject target)
+        {
+            var renderers = target.GetComponentsInChildren<Renderer>();
+            if (renderers == null || renderers.Length == 0)
+                return;
+
+            var bounds = GetGlobalBounds(renderers);
+
+            var encapsulatingSphereDiameter = (bounds.max - bounds.min).magnitude;
+            var encapsulatingSphereRadius = encapsulatingSphereDiameter / 2;
+
+            var angle = Camera.fieldOfView / 2;
+            var sinAngle = Mathf.Sin(angle * Mathf.Deg2Rad);
+            var distance = encapsulatingSphereRadius / sinAngle;
+
+            Camera.transform.position = new Vector3(bounds.center.x, bounds.center.y + distance, bounds.center.z);
+            Camera.transform.LookAt(bounds.center);
+            Camera.transform.RotateAround(bounds.center, Vector3.left, 65);
+            Camera.transform.RotateAround(bounds.center, Vector3.up, 235);
+
+            Camera.nearClipPlane = 0.01f;
+            Camera.farClipPlane = 10000;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/MeshScreenshotter.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/MeshScreenshotter.cs.meta
new file mode 100644
index 0000000..7802999
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/MeshScreenshotter.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: f0339d22d91b7c94ebc18b1de6f1e287
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/MeshScreenshotter.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/SceneScreenshotterBase.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/SceneScreenshotterBase.cs
new file mode 100644
index 0000000..d0dab58
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/SceneScreenshotterBase.cs
@@ -0,0 +1,124 @@
+using AssetStoreTools.Previews.Utility;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using UnityEngine;
+
+namespace AssetStoreTools.Previews.Generators.Custom.Screenshotters
+{
+    internal abstract class SceneScreenshotterBase : ISceneScreenshotter
+    {
+        public SceneScreenshotterSettings Settings { get; }
+
+        protected Camera Camera => GetCamera();
+        private Camera _camera;
+
+        public SceneScreenshotterBase(SceneScreenshotterSettings settings)
+        {
+            Settings = settings;
+        }
+
+        private Camera GetCamera()
+        {
+            if (_camera == null)
+            {
+#if UNITY_2022_3_OR_NEWER
+                _camera = GameObject.FindFirstObjectByType<Camera>(FindObjectsInactive.Include);
+#else
+                _camera = GameObject.FindObjectOfType<Camera>();
+#endif
+            }
+
+            return _camera;
+        }
+
+        public virtual void ValidateSettings()
+        {
+            if (Settings.Width <= 0)
+                throw new ArgumentException("Width should be larger than 0");
+
+            if (Settings.Height <= 0)
+                throw new ArgumentException("Height should be larger than 0");
+
+            if (Settings.Depth <= 0)
+                throw new ArgumentException("Depth should be larger than 0");
+
+            if (Settings.NativeWidth <= 0)
+                throw new ArgumentException("Native width should be larger than 0");
+
+            if (Settings.NativeHeight <= 0)
+                throw new ArgumentException("Native height should be larger than 0");
+        }
+
+        public abstract void PositionCamera(GameObject target);
+
+        public string Screenshot(string outputPath)
+        {
+            ValidateSettings();
+
+            var texture = GraphicsUtility.GetTextureFromCamera(Camera, Settings.NativeWidth, Settings.NativeHeight, Settings.Depth);
+
+            if (Settings.Width < Settings.NativeWidth || Settings.Height < Settings.NativeHeight)
+                texture = GraphicsUtility.ResizeTexture(texture, Settings.Width, Settings.Height);
+
+            var extension = PreviewConvertUtility.ConvertExtension(Settings.Format);
+            var writtenPath = $"{outputPath}.{extension}";
+            var bytes = PreviewConvertUtility.ConvertTexture(texture, Settings.Format);
+            File.WriteAllBytes(writtenPath, bytes);
+
+            return writtenPath;
+        }
+
+        public string Screenshot(GameObject target, string outputPath)
+        {
+            PositionCamera(target);
+            PositionLighting(target);
+            return Screenshot(outputPath);
+        }
+
+        private void PositionLighting(GameObject target)
+        {
+#if UNITY_2022_3_OR_NEWER
+            var light = GameObject.FindFirstObjectByType<Light>(FindObjectsInactive.Include);
+#else
+            var light = GameObject.FindObjectOfType<Light>();
+#endif
+            light.transform.position = Camera.transform.position;
+            light.transform.LookAt(target.transform);
+            light.transform.RotateAround(target.transform.position, Vector3.forward, 60f);
+        }
+
+        protected Bounds GetGlobalBounds(IEnumerable<Renderer> renderers)
+        {
+            var center = Vector3.zero;
+
+            foreach (var renderer in renderers)
+            {
+                center += renderer.bounds.center;
+            }
+            center /= renderers.Count();
+
+            var globalBounds = new Bounds(center, Vector3.zero);
+
+            foreach (var renderer in renderers)
+            {
+                globalBounds.Encapsulate(renderer.bounds);
+            }
+
+            return globalBounds;
+        }
+
+        protected Bounds GetNormalizedBounds(Bounds bounds)
+        {
+            var largestExtent = Mathf.Max(bounds.extents.x, bounds.extents.y, bounds.extents.z);
+            var normalizedBounds = new Bounds()
+            {
+                center = bounds.center,
+                extents = new Vector3(largestExtent, largestExtent, largestExtent)
+            };
+
+            return normalizedBounds;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/SceneScreenshotterBase.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/SceneScreenshotterBase.cs.meta
new file mode 100644
index 0000000..bf6bbf0
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/SceneScreenshotterBase.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: ce77aefdce8a37f498d17d73da53d0a4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/SceneScreenshotterBase.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/SceneScreenshotterSettings.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/SceneScreenshotterSettings.cs
new file mode 100644
index 0000000..ebe4e8e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/SceneScreenshotterSettings.cs
@@ -0,0 +1,16 @@
+using AssetStoreTools.Previews.Data;
+
+namespace AssetStoreTools.Previews.Generators.Custom.Screenshotters
+{
+    internal class SceneScreenshotterSettings
+    {
+        public int Width;
+        public int Height;
+        public int Depth;
+
+        public int NativeWidth;
+        public int NativeHeight;
+
+        public PreviewFormat Format;
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/SceneScreenshotterSettings.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/SceneScreenshotterSettings.cs.meta
new file mode 100644
index 0000000..04d76d7
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/SceneScreenshotterSettings.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: aa34806e243bad949892d06dd47295e2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/Screenshotters/SceneScreenshotterSettings.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators.meta
new file mode 100644
index 0000000..e13d726
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b4bb2dd0960418d4a8d4efd34b92a418
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/AudioTypeGeneratorSettings.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/AudioTypeGeneratorSettings.cs
new file mode 100644
index 0000000..aa570ba
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/AudioTypeGeneratorSettings.cs
@@ -0,0 +1,15 @@
+using AssetStoreTools.Previews.Data;
+using UnityEngine;
+
+namespace AssetStoreTools.Previews.Generators.Custom.TypeGenerators
+{
+    internal class AudioTypeGeneratorSettings : TypeGeneratorSettings
+    {
+        public int Width;
+        public int Height;
+
+        public Color SampleColor;
+        public Color BackgroundColor;
+        public PreviewFormat Format;
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/AudioTypeGeneratorSettings.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/AudioTypeGeneratorSettings.cs.meta
new file mode 100644
index 0000000..fbf89c9
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/AudioTypeGeneratorSettings.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 5b7ab1b072d95be4daf221ee23af1c80
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/AudioTypeGeneratorSettings.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/AudioTypePreviewGenerator.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/AudioTypePreviewGenerator.cs
new file mode 100644
index 0000000..60c2507
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/AudioTypePreviewGenerator.cs
@@ -0,0 +1,207 @@
+using AssetStoreTools.Previews.Data;
+using AssetStoreTools.Previews.Utility;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using UnityEditor;
+using UnityEngine;
+
+namespace AssetStoreTools.Previews.Generators.Custom.TypeGenerators
+{
+    internal class AudioTypePreviewGenerator : TypePreviewGeneratorBase
+    {
+        private AudioTypeGeneratorSettings _settings;
+        private Texture2D _texture;
+
+        public override event Action<int, int> OnAssetProcessed;
+
+        public AudioTypePreviewGenerator(AudioTypeGeneratorSettings settings) : base(settings)
+        {
+            _settings = settings;
+        }
+
+        public override void ValidateSettings()
+        {
+            base.ValidateSettings();
+
+            if (_settings.Width <= 0)
+                throw new ArgumentException("Width must be larger than 0");
+
+            if (_settings.Height <= 0)
+                throw new ArgumentException("Height must be larger than 0");
+        }
+
+        protected override IEnumerable<UnityEngine.Object> CollectAssets()
+        {
+            var assets = new List<UnityEngine.Object>();
+            var materialGuids = AssetDatabase.FindAssets("t:audioclip", Settings.InputPaths);
+            foreach (var guid in materialGuids)
+            {
+                var audioClip = AssetDatabase.LoadAssetAtPath<AudioClip>(AssetDatabase.GUIDToAssetPath(guid));
+
+                // Skip nested audio clips
+                if (!AssetDatabase.IsMainAsset(audioClip))
+                    continue;
+
+                // Skip materials with an error shader
+                if (!IsLoadTypeSupported(audioClip))
+                {
+                    Debug.LogWarning($"Audio clip '{audioClip}' is using a load type which cannot retrieve sample data. Preview will not be generated.");
+                    continue;
+                }
+
+                assets.Add(audioClip);
+            }
+
+            return assets;
+        }
+
+        private bool IsLoadTypeSupported(AudioClip audioClip)
+        {
+            if (audioClip.loadType == AudioClipLoadType.DecompressOnLoad)
+                return true;
+
+            return false;
+        }
+
+        protected override async Task<List<PreviewMetadata>> GenerateImpl(IEnumerable<UnityEngine.Object> assets)
+        {
+            var generatedPreviews = new List<PreviewMetadata>();
+            var audioClips = assets.ToList();
+            for (int i = 0; i < audioClips.Count; i++)
+            {
+                var audioClip = audioClips[i] as AudioClip;
+                if (audioClip != null)
+                {
+                    var texture = GenerateAudioClipTexture(audioClip);
+
+                    var outputPath = GenerateOutputPathWithExtension(audioClip, _settings.PreviewFileNamingFormat, _settings.Format);
+                    var bytes = PreviewConvertUtility.ConvertTexture(texture, _settings.Format);
+                    File.WriteAllBytes(outputPath, bytes);
+                    generatedPreviews.Add(ObjectToMetadata(audioClip, outputPath));
+                }
+
+                OnAssetProcessed?.Invoke(i, audioClips.Count);
+                await Task.Yield();
+            }
+
+            return generatedPreviews;
+        }
+
+        private Texture2D GenerateAudioClipTexture(AudioClip audioClip)
+        {
+            if (!audioClip.LoadAudioData())
+                throw new Exception("Could not load audio data");
+
+            try
+            {
+                if (_texture == null)
+                    _texture = new Texture2D(_settings.Width, _settings.Height);
+                else
+#if UNITY_2021_3_OR_NEWER || UNITY_2022_1_OR_NEWER || UNITY_2021_2_OR_NEWER
+                    _texture.Reinitialize(_settings.Width, _settings.Height);
+#else
+                    _texture.Resize(_settings.Width, _settings.Height);
+#endif
+
+                FillTextureBackground();
+                FillTextureForeground(audioClip);
+
+                _texture.Apply();
+                return _texture;
+            }
+            finally
+            {
+                audioClip.UnloadAudioData();
+            }
+        }
+
+        private void FillTextureBackground()
+        {
+            for (int i = 0; i < _texture.width; i++)
+            {
+                for (int j = 0; j < _texture.height; j++)
+                {
+                    _texture.SetPixel(i, j, _settings.BackgroundColor);
+                }
+            }
+        }
+
+        private void FillTextureForeground(AudioClip audioClip)
+        {
+            var channels = CreateChannels(audioClip);
+
+            for (int i = 0; i < channels.Count; i++)
+            {
+                DrawChannel(channels[i]);
+            }
+        }
+
+        private List<AudioChannel> CreateChannels(AudioClip audioClip)
+        {
+            var channelSamples = GetChannelSamples(audioClip);
+            var sectionSize = _texture.height / audioClip.channels;
+
+            var channels = new List<AudioChannel>();
+
+            for (int i = 0; i < audioClip.channels; i++)
+            {
+                var channelMaxY = (_texture.height - 1) - i * sectionSize;
+                var channelMinY = _texture.height - (i + 1) * sectionSize;
+                var channel = new AudioChannel(channelMinY, channelMaxY, channelSamples[i]);
+                channels.Add(channel);
+            }
+
+            return channels;
+        }
+
+        private List<List<float>> GetChannelSamples(AudioClip audioClip)
+        {
+            var channelSamples = new List<List<float>>();
+            var allSamples = new float[audioClip.samples * audioClip.channels];
+
+            if (!audioClip.GetData(allSamples, 0))
+                throw new Exception("Could not retrieve audio samples");
+
+            for (int i = 0; i < audioClip.channels; i++)
+            {
+                var samples = new List<float>();
+                var sampleIndex = i;
+                while (sampleIndex < allSamples.Length)
+                {
+                    samples.Add(allSamples[sampleIndex]);
+                    sampleIndex += audioClip.channels;
+                }
+
+                channelSamples.Add(samples);
+            }
+
+            return channelSamples;
+        }
+
+        private void DrawChannel(AudioChannel channel)
+        {
+            var sectionData = channel.GetCoordinateData(_texture.width);
+
+            foreach (var data in sectionData)
+            {
+                DrawVerticalColumn(data.X, data.YBaseline, data.YAboveBaseline, data.YBelowBaseline, _settings.SampleColor);
+            }
+        }
+
+        private void DrawVerticalColumn(int x, int yBaseline, int y1, int y2, Color color)
+        {
+            _texture.SetPixel(x, yBaseline, color);
+
+            var startIndex = y1 < y2 ? y1 : y2;
+            var endIndex = y1 < y2 ? y2 : y1;
+
+            for (int i = startIndex; i < endIndex; i++)
+            {
+                _texture.SetPixel(x, i, color);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/AudioTypePreviewGenerator.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/AudioTypePreviewGenerator.cs.meta
new file mode 100644
index 0000000..11499cf
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/AudioTypePreviewGenerator.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 9ddf69bb2dca51a42aff247b3a471bb3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/AudioTypePreviewGenerator.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/ITypePreviewGenerator.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/ITypePreviewGenerator.cs
new file mode 100644
index 0000000..bbe209a
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/ITypePreviewGenerator.cs
@@ -0,0 +1,16 @@
+using AssetStoreTools.Previews.Data;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace AssetStoreTools.Previews.Generators.Custom.TypeGenerators
+{
+    internal interface ITypePreviewGenerator
+    {
+        TypeGeneratorSettings Settings { get; }
+
+        event Action<int, int> OnAssetProcessed;
+
+        Task<List<PreviewMetadata>> Generate();
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/ITypePreviewGenerator.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/ITypePreviewGenerator.cs.meta
new file mode 100644
index 0000000..8069f54
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/ITypePreviewGenerator.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 7d9cd368dc73a23478390ee1332cb0be
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/ITypePreviewGenerator.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/MaterialTypePreviewGenerator.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/MaterialTypePreviewGenerator.cs
new file mode 100644
index 0000000..404a1a6
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/MaterialTypePreviewGenerator.cs
@@ -0,0 +1,85 @@
+using AssetStoreTools.Previews.Data;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using UnityEditor;
+using UnityEngine;
+
+namespace AssetStoreTools.Previews.Generators.Custom.TypeGenerators
+{
+    internal class MaterialTypePreviewGenerator : TypePreviewGeneratorFromScene
+    {
+        public override event Action<int, int> OnAssetProcessed;
+
+        public MaterialTypePreviewGenerator(TypePreviewGeneratorFromSceneSettings settings) : base(settings) { }
+
+        protected override IEnumerable<UnityEngine.Object> CollectAssets()
+        {
+            var assets = new List<UnityEngine.Object>();
+            var materialGuids = AssetDatabase.FindAssets("t:material", Settings.InputPaths);
+            foreach (var guid in materialGuids)
+            {
+                var mat = AssetDatabase.LoadAssetAtPath<Material>(AssetDatabase.GUIDToAssetPath(guid));
+
+                // Skip nested materials
+                if (!AssetDatabase.IsMainAsset(mat))
+                    continue;
+
+                // Skip materials with an error shader
+                if (IsShaderInvalid(mat.shader))
+                {
+                    Debug.LogWarning($"Material '{mat}' is using an erroring shader. Preview will not be generated.");
+                    continue;
+                }
+
+                assets.Add(mat);
+            }
+
+            return assets;
+        }
+
+        protected override async Task<List<PreviewMetadata>> GeneratePreviewsInScene(IEnumerable<UnityEngine.Object> assets)
+        {
+            var generatedPreviews = new List<PreviewMetadata>();
+            var materials = assets.ToList();
+            var sphere = GameObject.CreatePrimitive(PrimitiveType.Sphere);
+
+            var hasMeshRenderer = sphere.TryGetComponent<Renderer>(out var meshRenderer);
+            if (!hasMeshRenderer)
+                throw new Exception($"Could not find a MeshRenderer for {sphere}");
+
+            for (int i = 0; i < materials.Count; i++)
+            {
+                ThrowIfSceneChanged();
+
+                var material = materials[i] as Material;
+
+                if (material != null)
+                {
+                    meshRenderer.sharedMaterial = material;
+                    var previewPath = Settings.Screenshotter.Screenshot(sphere, GenerateOutputPathWithoutExtension(material, Settings.PreviewFileNamingFormat));
+                    if (!string.IsNullOrEmpty(previewPath))
+                        generatedPreviews.Add(ObjectToMetadata(material, previewPath));
+                }
+
+                OnAssetProcessed?.Invoke(i, materials.Count);
+                await Task.Yield();
+            }
+
+            UnityEngine.Object.DestroyImmediate(sphere);
+            return generatedPreviews;
+        }
+
+        private bool IsShaderInvalid(Shader shader)
+        {
+            if (ShaderUtil.ShaderHasError(shader))
+                return true;
+
+            if (!shader.isSupported)
+                return true;
+
+            return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/MaterialTypePreviewGenerator.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/MaterialTypePreviewGenerator.cs.meta
new file mode 100644
index 0000000..b4edb16
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/MaterialTypePreviewGenerator.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: a4e121bae63a199458e53a523dd18c8c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/MaterialTypePreviewGenerator.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/ModelTypePreviewGenerator.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/ModelTypePreviewGenerator.cs
new file mode 100644
index 0000000..3c00e7f
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/ModelTypePreviewGenerator.cs
@@ -0,0 +1,86 @@
+using AssetStoreTools.Previews.Data;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using UnityEditor;
+using UnityEngine;
+
+namespace AssetStoreTools.Previews.Generators.Custom.TypeGenerators
+{
+    internal class ModelTypePreviewGenerator : TypePreviewGeneratorFromScene
+    {
+        public override event Action<int, int> OnAssetProcessed;
+
+        public ModelTypePreviewGenerator(TypePreviewGeneratorFromSceneSettings settings) : base(settings) { }
+
+        protected override IEnumerable<UnityEngine.Object> CollectAssets()
+        {
+            var models = new List<UnityEngine.Object>();
+            var modelGuids = AssetDatabase.FindAssets("t:model", Settings.InputPaths);
+
+            foreach (var guid in modelGuids)
+            {
+                var model = AssetDatabase.LoadAssetAtPath<GameObject>(AssetDatabase.GUIDToAssetPath(guid));
+
+                // Skip nested models
+                if (!AssetDatabase.IsMainAsset(model))
+                    continue;
+
+                // Skip models without renderers
+                if (model.GetComponentsInChildren<Renderer>().Length == 0)
+                    continue;
+
+                models.Add(model);
+            }
+
+            return models;
+        }
+
+        protected override async Task<List<PreviewMetadata>> GeneratePreviewsInScene(IEnumerable<UnityEngine.Object> assets)
+        {
+            var generatedPreviews = new List<PreviewMetadata>();
+            var models = assets.ToList();
+            var referenceShader = GetDefaultObjectShader();
+
+            for (int i = 0; i < models.Count; i++)
+            {
+                ThrowIfSceneChanged();
+
+                var model = models[i] as GameObject;
+
+                if (model != null)
+                {
+                    var go = UnityEngine.Object.Instantiate(model, Vector3.zero, Quaternion.Euler(0, 0, 0));
+                    ReplaceShaders(go, referenceShader);
+
+                    var previewPath = Settings.Screenshotter.Screenshot(go, GenerateOutputPathWithoutExtension(model, Settings.PreviewFileNamingFormat));
+                    if (!string.IsNullOrEmpty(previewPath))
+                        generatedPreviews.Add(ObjectToMetadata(model, previewPath));
+
+                    UnityEngine.Object.DestroyImmediate(go);
+                }
+
+                OnAssetProcessed?.Invoke(i, models.Count);
+                await Task.Yield();
+            }
+
+            return generatedPreviews;
+        }
+
+        private void ReplaceShaders(GameObject go, Shader shader)
+        {
+            var meshRenderers = go.GetComponentsInChildren<Renderer>();
+            foreach (var mr in meshRenderers)
+            {
+                var materialArray = mr.sharedMaterials;
+                for (int i = 0; i < materialArray.Length; i++)
+                {
+                    materialArray[i] = new Material(shader) { color = new Color(0.7f, 0.7f, 0.7f) };
+                }
+
+                mr.sharedMaterials = materialArray;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/ModelTypePreviewGenerator.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/ModelTypePreviewGenerator.cs.meta
new file mode 100644
index 0000000..dacc7e3
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/ModelTypePreviewGenerator.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: fca8a1fa8a211874cb84d3d811a0158c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/ModelTypePreviewGenerator.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/PrefabTypePreviewGenerator.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/PrefabTypePreviewGenerator.cs
new file mode 100644
index 0000000..9ae36ba
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/PrefabTypePreviewGenerator.cs
@@ -0,0 +1,113 @@
+using AssetStoreTools.Previews.Data;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using UnityEditor;
+using UnityEngine;
+
+namespace AssetStoreTools.Previews.Generators.Custom.TypeGenerators
+{
+    internal class PrefabTypePreviewGenerator : TypePreviewGeneratorFromScene
+    {
+        public override event Action<int, int> OnAssetProcessed;
+
+        public PrefabTypePreviewGenerator(TypePreviewGeneratorFromSceneSettings settings) : base(settings) { }
+
+        protected override IEnumerable<UnityEngine.Object> CollectAssets()
+        {
+            var prefabs = new List<UnityEngine.Object>();
+            var prefabGuids = AssetDatabase.FindAssets("t:prefab", Settings.InputPaths);
+
+            foreach (var guid in prefabGuids)
+            {
+                var prefab = AssetDatabase.LoadAssetAtPath<GameObject>(AssetDatabase.GUIDToAssetPath(guid));
+
+                // Skip nested prefabs
+                if (!AssetDatabase.IsMainAsset(prefab))
+                    continue;
+
+                // Skip prefabs without renderers
+                if (prefab.GetComponentsInChildren<Renderer>().Length == 0)
+                    continue;
+
+                prefabs.Add(prefab);
+            }
+
+            return prefabs;
+        }
+
+        protected override async Task<List<PreviewMetadata>> GeneratePreviewsInScene(IEnumerable<UnityEngine.Object> assets)
+        {
+            var generatedPreviews = new List<PreviewMetadata>();
+            var prefabs = assets.ToList();
+            var objectReferenceShader = GetDefaultObjectShader();
+            var particleReferenceShader = GetDefaultParticleShader();
+
+            for (int i = 0; i < prefabs.Count; i++)
+            {
+                ThrowIfSceneChanged();
+
+                var prefab = prefabs[i] as GameObject;
+                if (prefab != null)
+                {
+                    var go = UnityEngine.Object.Instantiate(prefab, Vector3.zero, Quaternion.Euler(0, 0, 0));
+
+                    ReplaceMissingShaders(go, objectReferenceShader, particleReferenceShader);
+
+                    HandleParticleSystems(go);
+
+                    var previewPath = Settings.Screenshotter.Screenshot(go, GenerateOutputPathWithoutExtension(prefab, Settings.PreviewFileNamingFormat));
+                    if (!string.IsNullOrEmpty(previewPath))
+                        generatedPreviews.Add(ObjectToMetadata(prefab, previewPath));
+
+                    UnityEngine.Object.DestroyImmediate(go);
+                }
+
+                OnAssetProcessed?.Invoke(i, prefabs.Count);
+                await Task.Yield();
+            }
+
+            return generatedPreviews;
+        }
+
+        private void ReplaceMissingShaders(GameObject go, Shader objectShader, Shader particleShader)
+        {
+            var meshRenderers = go.GetComponentsInChildren<Renderer>();
+            foreach (var mr in meshRenderers)
+            {
+                var shaderToUse = mr is ParticleSystemRenderer ? particleShader : objectShader;
+
+                var materialArray = mr.sharedMaterials;
+                for (int i = 0; i < materialArray.Length; i++)
+                {
+                    if (materialArray[i] == null)
+                    {
+                        materialArray[i] = new Material(shaderToUse);
+                    }
+                    else if (!materialArray[i].shader.isSupported)
+                    {
+                        materialArray[i].shader = shaderToUse;
+                    }
+                }
+
+                mr.sharedMaterials = materialArray;
+            }
+        }
+
+        private void HandleParticleSystems(GameObject go)
+        {
+            var particleSystems = go.GetComponentsInChildren<ParticleSystem>();
+            if (particleSystems.Length == 0)
+                return;
+
+            foreach (var ps in particleSystems)
+            {
+                ps.Stop();
+                ps.Clear();
+                ps.randomSeed = 1;
+                ps.Simulate(10, false, true, false);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/PrefabTypePreviewGenerator.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/PrefabTypePreviewGenerator.cs.meta
new file mode 100644
index 0000000..ce81404
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/PrefabTypePreviewGenerator.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 24b15b10bc361c84581f46cb6dd644cc
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/PrefabTypePreviewGenerator.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TextureTypeGeneratorSettings.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TextureTypeGeneratorSettings.cs
new file mode 100644
index 0000000..bca340e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TextureTypeGeneratorSettings.cs
@@ -0,0 +1,11 @@
+using AssetStoreTools.Previews.Data;
+
+namespace AssetStoreTools.Previews.Generators.Custom.TypeGenerators
+{
+    internal class TextureTypeGeneratorSettings : TypeGeneratorSettings
+    {
+        public int MaxWidth;
+        public int MaxHeight;
+        public PreviewFormat Format;
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TextureTypeGeneratorSettings.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TextureTypeGeneratorSettings.cs.meta
new file mode 100644
index 0000000..09acc0d
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TextureTypeGeneratorSettings.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 058d746982619b04eb5e200363003899
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TextureTypeGeneratorSettings.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TextureTypePreviewGenerator.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TextureTypePreviewGenerator.cs
new file mode 100644
index 0000000..1ea3178
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TextureTypePreviewGenerator.cs
@@ -0,0 +1,116 @@
+using AssetStoreTools.Previews.Data;
+using AssetStoreTools.Previews.Utility;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using UnityEditor;
+using UnityEngine;
+
+namespace AssetStoreTools.Previews.Generators.Custom.TypeGenerators
+{
+    internal class TextureTypePreviewGenerator : TypePreviewGeneratorBase
+    {
+        private TextureTypeGeneratorSettings _settings;
+
+        public override event Action<int, int> OnAssetProcessed;
+
+        public TextureTypePreviewGenerator(TextureTypeGeneratorSettings settings) : base(settings)
+        {
+            _settings = settings;
+        }
+
+        public override void ValidateSettings()
+        {
+            base.ValidateSettings();
+
+            if (_settings.MaxWidth <= 0)
+                throw new ArgumentException("Max width should be larger than 0");
+
+            if (_settings.MaxHeight <= 0)
+                throw new ArgumentException("Max height should be larger than 0");
+        }
+
+        protected override IEnumerable<UnityEngine.Object> CollectAssets()
+        {
+            var textures = new List<UnityEngine.Object>();
+            var textureGuids = AssetDatabase.FindAssets("t:texture", Settings.InputPaths);
+
+            foreach (var guid in textureGuids)
+            {
+                var texture = AssetDatabase.LoadAssetAtPath<Texture>(AssetDatabase.GUIDToAssetPath(guid));
+
+                // Skip nested textures
+                if (!AssetDatabase.IsMainAsset(texture))
+                    continue;
+
+                textures.Add(texture);
+            }
+
+            return textures;
+        }
+
+        protected override async Task<List<PreviewMetadata>> GenerateImpl(IEnumerable<UnityEngine.Object> assets)
+        {
+            var generatedPreviews = new List<PreviewMetadata>();
+            var textures = assets.ToList();
+
+            for (int i = 0; i < textures.Count; i++)
+            {
+                var texture = textures[i] as Texture2D;
+
+                if (texture != null)
+                {
+                    Texture2D resizedTexture;
+                    CalculateTextureSize(texture, out var resizeWidth, out var resizeHeight);
+
+                    var importer = AssetImporter.GetAtPath(AssetDatabase.GetAssetPath(texture)) as TextureImporter;
+                    if (importer != null && importer.textureType == TextureImporterType.NormalMap)
+                        resizedTexture = GraphicsUtility.ResizeTextureNormalMap(texture, resizeWidth, resizeHeight);
+                    else
+                        resizedTexture = GraphicsUtility.ResizeTexture(texture, resizeWidth, resizeHeight);
+
+                    var previewPath = GenerateOutputPathWithExtension(texture, _settings.PreviewFileNamingFormat, _settings.Format);
+
+                    // Some textures may be transparent and need to be encoded as PNG to look correctly
+                    var targetFormat = texture.alphaIsTransparency ? PreviewFormat.PNG : _settings.Format;
+                    var bytes = PreviewConvertUtility.ConvertTexture(resizedTexture, targetFormat);
+
+                    File.WriteAllBytes(previewPath, bytes);
+                    generatedPreviews.Add(ObjectToMetadata(texture, previewPath));
+                }
+
+                OnAssetProcessed?.Invoke(i, textures.Count);
+                await Task.Yield();
+            }
+
+            return generatedPreviews;
+        }
+
+        private void CalculateTextureSize(Texture2D texture, out int width, out int height)
+        {
+            if (texture.width <= _settings.MaxWidth && texture.height <= _settings.MaxHeight)
+            {
+                width = texture.width;
+                height = texture.height;
+                return;
+            }
+
+            var widthLongerThanHeight = texture.width > texture.height;
+
+            if (widthLongerThanHeight)
+            {
+                var ratio = (float)texture.width / texture.height;
+                width = _settings.MaxWidth;
+                height = Mathf.RoundToInt(width / ratio);
+            }
+            else
+            {
+                var ratio = (float)texture.height / texture.width;
+                height = _settings.MaxHeight;
+                width = Mathf.RoundToInt(height / ratio);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TextureTypePreviewGenerator.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TextureTypePreviewGenerator.cs.meta
new file mode 100644
index 0000000..90d58b7
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TextureTypePreviewGenerator.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: b04f55867ee575c489803356220feb31
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TextureTypePreviewGenerator.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TypeGeneratorSettings.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TypeGeneratorSettings.cs
new file mode 100644
index 0000000..0e20f0e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TypeGeneratorSettings.cs
@@ -0,0 +1,12 @@
+using AssetStoreTools.Previews.Data;
+
+namespace AssetStoreTools.Previews.Generators.Custom.TypeGenerators
+{
+    internal abstract class TypeGeneratorSettings
+    {
+        public string[] InputPaths;
+        public string[] IgnoredGuids;
+        public string OutputPath;
+        public FileNameFormat PreviewFileNamingFormat;
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TypeGeneratorSettings.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TypeGeneratorSettings.cs.meta
new file mode 100644
index 0000000..90f895d
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TypeGeneratorSettings.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: a224a4b41a8c7cf4cb53dd77d6f2518b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TypeGeneratorSettings.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TypePreviewGeneratorBase.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TypePreviewGeneratorBase.cs
new file mode 100644
index 0000000..74c567d
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TypePreviewGeneratorBase.cs
@@ -0,0 +1,126 @@
+using AssetStoreTools.Previews.Data;
+using AssetStoreTools.Previews.Utility;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using UnityEditor;
+
+namespace AssetStoreTools.Previews.Generators.Custom.TypeGenerators
+{
+    internal abstract class TypePreviewGeneratorBase : ITypePreviewGenerator
+    {
+        public TypeGeneratorSettings Settings { get; }
+
+        public abstract event Action<int, int> OnAssetProcessed;
+
+        public TypePreviewGeneratorBase(TypeGeneratorSettings settings)
+        {
+            Settings = settings;
+        }
+
+        public virtual void ValidateSettings()
+        {
+            if (Settings.InputPaths == null || Settings.InputPaths.Length == 0)
+                throw new ArgumentException("Input path cannot be null");
+
+            foreach (var path in Settings.InputPaths)
+            {
+                var inputPath = path.EndsWith("/") ? path.Remove(path.Length - 1) : path;
+                if (!AssetDatabase.IsValidFolder(inputPath))
+                    throw new ArgumentException($"Input path '{inputPath}' is not a valid ADB folder");
+            }
+
+            if (string.IsNullOrEmpty(Settings.OutputPath))
+                throw new ArgumentException("Output path cannot be null");
+        }
+
+        public async Task<List<PreviewMetadata>> Generate()
+        {
+            var generatedPreviews = new List<PreviewMetadata>();
+            ValidateSettings();
+
+            var assets = CollectAssets();
+            assets = FilterIgnoredAssets(assets);
+
+            if (assets.Count() == 0)
+                return generatedPreviews;
+
+            return await GenerateImpl(assets);
+        }
+
+        protected abstract IEnumerable<UnityEngine.Object> CollectAssets();
+
+        private IEnumerable<UnityEngine.Object> FilterIgnoredAssets(IEnumerable<UnityEngine.Object> assets)
+        {
+            if (Settings.IgnoredGuids == null || Settings.IgnoredGuids.Length == 0)
+                return assets;
+
+            var filteredAssets = new List<UnityEngine.Object>();
+            foreach (var asset in assets)
+            {
+                if (!AssetDatabase.TryGetGUIDAndLocalFileIdentifier(asset, out var guid, out long _))
+                    continue;
+
+                if (Settings.IgnoredGuids.Any(x => x == guid))
+                    continue;
+
+                filteredAssets.Add(asset);
+            }
+
+            return filteredAssets;
+        }
+
+        protected abstract Task<List<PreviewMetadata>> GenerateImpl(IEnumerable<UnityEngine.Object> assets);
+
+        protected PreviewMetadata ObjectToMetadata(UnityEngine.Object obj, string previewPath)
+        {
+            if (!AssetDatabase.TryGetGUIDAndLocalFileIdentifier(obj, out var guid, out long _))
+                throw new Exception($"Could not retrieve guid for object {obj}");
+
+            return new PreviewMetadata()
+            {
+                Type = GenerationType.Custom,
+                Guid = guid,
+                Name = obj.name,
+                Path = previewPath
+            };
+        }
+
+        protected string GenerateOutputPathWithoutExtension(UnityEngine.Object asset, FileNameFormat fileNameFormat)
+        {
+            PrepareOutputFolder(Settings.OutputPath, false);
+            var directoryPath = Settings.OutputPath;
+            var fileName = PreviewConvertUtility.ConvertFilename(asset, fileNameFormat);
+            var fullPath = $"{directoryPath}/{fileName}";
+
+            return fullPath;
+        }
+
+        protected string GenerateOutputPathWithExtension(UnityEngine.Object asset, FileNameFormat fileNameFormat, PreviewFormat previewFormat)
+        {
+            var partialOutputPath = GenerateOutputPathWithoutExtension(asset, fileNameFormat);
+            var extension = PreviewConvertUtility.ConvertExtension(previewFormat);
+
+            return $"{partialOutputPath}.{extension}";
+        }
+
+        private void PrepareOutputFolder(string outputPath, bool cleanup)
+        {
+            var dir = new DirectoryInfo(outputPath);
+
+            if (!dir.Exists)
+            {
+                dir.Create();
+                return;
+            }
+
+            if (!cleanup)
+                return;
+
+            dir.Delete(true);
+            dir.Create();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TypePreviewGeneratorBase.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TypePreviewGeneratorBase.cs.meta
new file mode 100644
index 0000000..8b3faa8
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TypePreviewGeneratorBase.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: c6fb2d639232bce4698338a252f47f3c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TypePreviewGeneratorBase.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TypePreviewGeneratorFromScene.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TypePreviewGeneratorFromScene.cs
new file mode 100644
index 0000000..cd3ad73
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TypePreviewGeneratorFromScene.cs
@@ -0,0 +1,111 @@
+using AssetStoreTools.Previews.Data;
+using AssetStoreTools.Previews.Utility;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using UnityEditor.SceneManagement;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+namespace AssetStoreTools.Previews.Generators.Custom.TypeGenerators
+{
+    internal abstract class TypePreviewGeneratorFromScene : TypePreviewGeneratorBase
+    {
+        protected new TypePreviewGeneratorFromSceneSettings Settings;
+
+        private CancellationTokenSource _cancellationTokenSource;
+
+        public TypePreviewGeneratorFromScene(TypePreviewGeneratorFromSceneSettings settings) : base(settings)
+        {
+            Settings = settings;
+        }
+
+        public override void ValidateSettings()
+        {
+            base.ValidateSettings();
+
+            if (Settings.Screenshotter == null)
+                throw new ArgumentException("Screenshotter cannot be null");
+        }
+
+        protected sealed override async Task<List<PreviewMetadata>> GenerateImpl(IEnumerable<UnityEngine.Object> assets)
+        {
+            var originalScenePath = EditorSceneManager.GetActiveScene().path;
+            await PreviewSceneUtility.OpenPreviewSceneForCurrentPipeline();
+
+            try
+            {
+                _cancellationTokenSource = new CancellationTokenSource();
+                EditorSceneManager.sceneOpened += SceneOpenedDuringGeneration;
+                return await GeneratePreviewsInScene(assets);
+            }
+            finally
+            {
+                EditorSceneManager.sceneOpened -= SceneOpenedDuringGeneration;
+                _cancellationTokenSource.Dispose();
+                if (!string.IsNullOrEmpty(originalScenePath))
+                    EditorSceneManager.OpenScene(originalScenePath);
+            }
+        }
+
+        protected abstract Task<List<PreviewMetadata>> GeneratePreviewsInScene(IEnumerable<UnityEngine.Object> assets);
+
+        private void SceneOpenedDuringGeneration(Scene _, OpenSceneMode __)
+        {
+            if (!_cancellationTokenSource.IsCancellationRequested)
+                _cancellationTokenSource.Cancel();
+        }
+
+        protected void ThrowIfSceneChanged()
+        {
+            if (_cancellationTokenSource.Token.IsCancellationRequested)
+                throw new Exception("Preview generation was aborted due to a change of the scene");
+        }
+
+        protected Shader GetDefaultObjectShader()
+        {
+            switch (RenderPipelineUtility.GetCurrentPipeline())
+            {
+                case RenderPipeline.BiRP:
+                    return Shader.Find("Standard");
+                case RenderPipeline.URP:
+                    return Shader.Find("Universal Render Pipeline/Lit");
+                case RenderPipeline.HDRP:
+                    return Shader.Find("HDRP/Lit");
+                default:
+                    throw new NotImplementedException("Undefined Render Pipeline");
+            }
+        }
+
+        protected Shader GetDefaultParticleShader()
+        {
+            switch (RenderPipelineUtility.GetCurrentPipeline())
+            {
+                case RenderPipeline.BiRP:
+                    return Shader.Find("Particles/Standard Unlit");
+                case RenderPipeline.URP:
+                    return Shader.Find("Universal Render Pipeline/Particles/Unlit");
+                case RenderPipeline.HDRP:
+                    return Shader.Find("HDRP/Unlit");
+                default:
+                    throw new NotImplementedException("Undefined Render Pipeline");
+            }
+        }
+
+        protected Shader GetDefaultTextureShader()
+        {
+            switch (RenderPipelineUtility.GetCurrentPipeline())
+            {
+                case RenderPipeline.BiRP:
+                    return Shader.Find("Unlit/Texture");
+                case RenderPipeline.URP:
+                    return Shader.Find("Universal Render Pipeline/Unlit");
+                case RenderPipeline.HDRP:
+                    return Shader.Find("HDRP/Unlit");
+                default:
+                    throw new NotImplementedException("Undefined Render Pipeline");
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TypePreviewGeneratorFromScene.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TypePreviewGeneratorFromScene.cs.meta
new file mode 100644
index 0000000..263c544
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TypePreviewGeneratorFromScene.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 1bf0eb8d7ef65f340be785dae96e4b73
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TypePreviewGeneratorFromScene.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TypePreviewGeneratorFromSceneSettings.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TypePreviewGeneratorFromSceneSettings.cs
new file mode 100644
index 0000000..e7452a2
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TypePreviewGeneratorFromSceneSettings.cs
@@ -0,0 +1,9 @@
+using AssetStoreTools.Previews.Generators.Custom.Screenshotters;
+
+namespace AssetStoreTools.Previews.Generators.Custom.TypeGenerators
+{
+    internal class TypePreviewGeneratorFromSceneSettings : TypeGeneratorSettings
+    {
+        public ISceneScreenshotter Screenshotter;
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TypePreviewGeneratorFromSceneSettings.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TypePreviewGeneratorFromSceneSettings.cs.meta
new file mode 100644
index 0000000..d51befd
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TypePreviewGeneratorFromSceneSettings.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: a6b871798f99ad44d9fca46789239ec1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/Custom/TypeGenerators/TypePreviewGeneratorFromSceneSettings.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/CustomPreviewGenerator.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/CustomPreviewGenerator.cs
new file mode 100644
index 0000000..70093c8
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/CustomPreviewGenerator.cs
@@ -0,0 +1,213 @@
+using AssetStoreTools.Previews.Data;
+using AssetStoreTools.Previews.Generators;
+using AssetStoreTools.Previews.Generators.Custom.Screenshotters;
+using AssetStoreTools.Previews.Generators.Custom.TypeGenerators;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using UnityEditor;
+
+namespace AssetStoreTools.Previews
+{
+    internal class CustomPreviewGenerator : PreviewGeneratorBase
+    {
+        private CustomPreviewGenerationSettings _customSettings;
+
+        public override event Action<float> OnProgressChanged;
+
+        public CustomPreviewGenerator(CustomPreviewGenerationSettings settings)
+            : base(settings)
+        {
+            _customSettings = settings;
+        }
+
+        protected override void Validate()
+        {
+            base.Validate();
+
+            if (_customSettings.Width <= 0)
+                throw new ArgumentException("Width should be larger than 0");
+
+            if (_customSettings.Height <= 0)
+                throw new ArgumentException("Height should be larger than 0");
+
+            if (_customSettings.Depth <= 0)
+                throw new ArgumentException("Depth should be larger than 0");
+
+            if (_customSettings.NativeWidth <= 0)
+                throw new ArgumentException("Native width should be larger than 0");
+
+            if (_customSettings.NativeHeight <= 0)
+                throw new ArgumentException("Native height should be larger than 0");
+        }
+
+        protected override async Task<PreviewGenerationResult> GenerateImpl()
+        {
+            var result = new PreviewGenerationResult()
+            {
+                GenerationType = _customSettings.GenerationType
+            };
+
+            OnProgressChanged?.Invoke(0f);
+
+            var generatedPreviews = new List<PreviewMetadata>();
+            var existingPreviews = GetExistingPreviews();
+            var generators = CreateGenerators(existingPreviews);
+
+            var currentGenerator = 0;
+            Action<int, int> generatorProgressCallback = null;
+            generatorProgressCallback = (currentAsset, totalAssets) => ReportProgress(currentGenerator, generators.Count(), currentAsset, totalAssets);
+
+            try
+            {
+                foreach (var generator in generators)
+                {
+                    generator.OnAssetProcessed += generatorProgressCallback;
+                    var typeGeneratorPreviews = await generator.Generate();
+                    generatedPreviews.AddRange(typeGeneratorPreviews);
+                    currentGenerator++;
+                }
+
+                AssetDatabase.Refresh();
+
+                var allPreviews = new List<PreviewMetadata>();
+                allPreviews.AddRange(generatedPreviews);
+                allPreviews.AddRange(existingPreviews);
+
+                result.Success = true;
+                result.GeneratedPreviews = generatedPreviews;
+                result.Previews = allPreviews;
+            }
+            catch (Exception e)
+            {
+                result.Success = false;
+                result.Exception = e;
+            }
+            finally
+            {
+                foreach (var generator in generators)
+                    generator.OnAssetProcessed -= generatorProgressCallback;
+            }
+
+            return result;
+        }
+
+        private IEnumerable<PreviewMetadata> GetExistingPreviews()
+        {
+            var existingPreviews = new List<PreviewMetadata>();
+
+            if (Settings.OverwriteExisting || !CachingService.GetCachedMetadata(out var database))
+                return existingPreviews;
+
+            var inputGuids = AssetDatabase.FindAssets("", _customSettings.InputPaths);
+            existingPreviews = database.Previews.Where(x => x.Type == GenerationType.Custom && x.Exists() && inputGuids.Any(y => y.Equals(x.Guid))).ToList();
+            return existingPreviews;
+        }
+
+        private IEnumerable<ITypePreviewGenerator> CreateGenerators(IEnumerable<PreviewMetadata> existingPreviews)
+        {
+            var ignoredGuids = existingPreviews.Select(x => x.Guid).ToArray();
+
+            var generators = new ITypePreviewGenerator[]
+            {
+                CreateAudioPreviewGenerator(ignoredGuids),
+                CreateMaterialPreviewGenerator(ignoredGuids),
+                CreateModelPreviewGenerator(ignoredGuids),
+                CreatePrefabPreviewGenerator(ignoredGuids),
+                CreateTexturePreviewGenerator(ignoredGuids)
+            };
+
+            return generators;
+        }
+
+        private ITypePreviewGenerator CreateAudioPreviewGenerator(string[] ignoredGuids)
+        {
+            var settings = new AudioTypeGeneratorSettings()
+            {
+                Width = _customSettings.Width,
+                Height = _customSettings.Height,
+                InputPaths = _customSettings.InputPaths,
+                OutputPath = _customSettings.OutputPath,
+                PreviewFileNamingFormat = _customSettings.PreviewFileNamingFormat,
+                Format = _customSettings.Format,
+                SampleColor = _customSettings.AudioSampleColor,
+                BackgroundColor = _customSettings.AudioBackgroundColor,
+                IgnoredGuids = ignoredGuids
+            };
+
+            return new AudioTypePreviewGenerator(settings);
+        }
+
+        private ITypePreviewGenerator CreateMaterialPreviewGenerator(string[] ignoredGuids)
+        {
+            var settings = CreateSceneGeneratorSettings(new MaterialScreenshotter(CreateScreenshotterSettings()), ignoredGuids);
+            return new MaterialTypePreviewGenerator(settings);
+        }
+
+        private ITypePreviewGenerator CreateModelPreviewGenerator(string[] ignoredGuids)
+        {
+            var settings = CreateSceneGeneratorSettings(new MeshScreenshotter(CreateScreenshotterSettings()), ignoredGuids);
+            return new ModelTypePreviewGenerator(settings);
+        }
+
+        private ITypePreviewGenerator CreatePrefabPreviewGenerator(string[] ignoredGuids)
+        {
+            var settings = CreateSceneGeneratorSettings(new MeshScreenshotter(CreateScreenshotterSettings()), ignoredGuids);
+            return new PrefabTypePreviewGenerator(settings);
+        }
+
+        private ITypePreviewGenerator CreateTexturePreviewGenerator(string[] ignoredGuids)
+        {
+            var settings = new TextureTypeGeneratorSettings()
+            {
+                MaxWidth = _customSettings.Width,
+                MaxHeight = _customSettings.Height,
+                InputPaths = _customSettings.InputPaths,
+                OutputPath = _customSettings.OutputPath,
+                Format = _customSettings.Format,
+                PreviewFileNamingFormat = _customSettings.PreviewFileNamingFormat,
+                IgnoredGuids = ignoredGuids
+            };
+
+            return new TextureTypePreviewGenerator(settings);
+        }
+
+        private TypePreviewGeneratorFromSceneSettings CreateSceneGeneratorSettings(ISceneScreenshotter screenshotter, string[] ignoredGuids)
+        {
+            var settings = new TypePreviewGeneratorFromSceneSettings()
+            {
+                InputPaths = _customSettings.InputPaths,
+                OutputPath = _customSettings.OutputPath,
+                PreviewFileNamingFormat = _customSettings.PreviewFileNamingFormat,
+                Screenshotter = screenshotter,
+                IgnoredGuids = ignoredGuids
+            };
+
+            return settings;
+        }
+
+        private SceneScreenshotterSettings CreateScreenshotterSettings()
+        {
+            var settings = new SceneScreenshotterSettings()
+            {
+                Width = _customSettings.Width,
+                Height = _customSettings.Height,
+                Depth = _customSettings.Depth,
+                Format = _customSettings.Format,
+                NativeWidth = _customSettings.NativeWidth,
+                NativeHeight = _customSettings.NativeHeight,
+            };
+
+            return settings;
+        }
+
+        private void ReportProgress(int currentGenerator, int totalGenerators, int currentGeneratorAsset, int totalCurrentGeneratorAssets)
+        {
+            var completedGeneratorProgress = (float)currentGenerator / totalGenerators;
+            var currentGeneratorProgress = ((float)currentGeneratorAsset / totalCurrentGeneratorAssets) / totalGenerators;
+            var progressToReport = completedGeneratorProgress + currentGeneratorProgress;
+            OnProgressChanged?.Invoke(progressToReport);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/CustomPreviewGenerator.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/CustomPreviewGenerator.cs.meta
new file mode 100644
index 0000000..4b18db3
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/CustomPreviewGenerator.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: e5906f8cb3e4eec489a2f7a82844bb3f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/CustomPreviewGenerator.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/IPreviewGenerator.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/IPreviewGenerator.cs
new file mode 100644
index 0000000..92e7e70
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/IPreviewGenerator.cs
@@ -0,0 +1,15 @@
+using AssetStoreTools.Previews.Data;
+using System;
+using System.Threading.Tasks;
+
+namespace AssetStoreTools.Previews.Generators
+{
+    internal interface IPreviewGenerator
+    {
+        PreviewGenerationSettings Settings { get; }
+
+        event Action<float> OnProgressChanged;
+
+        Task<PreviewGenerationResult> Generate();
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/IPreviewGenerator.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/IPreviewGenerator.cs.meta
new file mode 100644
index 0000000..c7178a8
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/IPreviewGenerator.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: ebddaccb94ca6e34aa36b535d0a47249
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/IPreviewGenerator.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/NativePreviewGenerator.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/NativePreviewGenerator.cs
new file mode 100644
index 0000000..3d551d1
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/NativePreviewGenerator.cs
@@ -0,0 +1,362 @@
+using AssetStoreTools.Previews.Data;
+using AssetStoreTools.Previews.Utility;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.Tilemaps;
+
+namespace AssetStoreTools.Previews.Generators
+{
+    internal class NativePreviewGenerator : PreviewGeneratorBase
+    {
+        private const double InitialPreviewLoadingTimeoutSeconds = 10;
+
+        private NativePreviewGenerationSettings _nativeSettings;
+
+        private RenderTexture _renderTexture;
+
+        private int _generatedPreviewsCount;
+        private int _totalPreviewsCount;
+
+        public override event Action<float> OnProgressChanged;
+
+        public NativePreviewGenerator(NativePreviewGenerationSettings settings)
+            : base(settings)
+        {
+            _nativeSettings = settings;
+        }
+
+        protected override void Validate()
+        {
+            base.Validate();
+
+            if (_nativeSettings.ChunkSize <= 0)
+                throw new ArgumentException("Chunk size must be larger than 0");
+        }
+
+        protected override async Task<PreviewGenerationResult> GenerateImpl()
+        {
+            var result = new PreviewGenerationResult()
+            {
+                GenerationType = _nativeSettings.GenerationType
+            };
+
+            OnProgressChanged?.Invoke(0f);
+
+            try
+            {
+                var objects = GetObjectsRequiringPreviews(_nativeSettings.InputPaths);
+                var filteredObjects = new List<PreviewMetadata>();
+                var reusedPreviews = new List<PreviewMetadata>();
+                FilterObjects(objects, filteredObjects, reusedPreviews);
+
+                _generatedPreviewsCount = 0;
+                _totalPreviewsCount = objects.Count;
+
+                Directory.CreateDirectory(_nativeSettings.OutputPath);
+
+                var generatedPreviews = new List<PreviewMetadata>();
+                if (!_nativeSettings.WaitForPreviews)
+                {
+                    WritePreviewsWithoutWaiting(filteredObjects, out generatedPreviews);
+                }
+                else
+                {
+                    if (_nativeSettings.ChunkedPreviewLoading)
+                    {
+                        await WaitAndWritePreviewsChunked(filteredObjects, generatedPreviews);
+                    }
+                    else
+                    {
+                        await WaitAndWritePreviews(filteredObjects, generatedPreviews);
+                    }
+                }
+
+                var allPreviews = new List<PreviewMetadata>();
+                allPreviews.AddRange(generatedPreviews);
+                allPreviews.AddRange(reusedPreviews);
+
+                result.Success = true;
+                result.GeneratedPreviews = generatedPreviews;
+                result.Previews = allPreviews;
+            }
+            catch (Exception e)
+            {
+                result.Success = false;
+                result.Exception = e;
+            }
+
+            return result;
+        }
+
+        private List<PreviewMetadata> GetObjectsRequiringPreviews(string[] inputPaths)
+        {
+            var objects = new List<PreviewMetadata>();
+            var guids = AssetDatabase.FindAssets("", inputPaths);
+
+            foreach (var guid in guids)
+            {
+                if (objects.Any(x => x.Guid == guid))
+                    continue;
+
+                var assetPath = AssetDatabase.GUIDToAssetPath(guid);
+                var obj = AssetDatabase.LoadAssetAtPath<UnityEngine.Object>(assetPath);
+                if (!ShouldHavePreview(obj))
+                    continue;
+
+                objects.Add(new PreviewMetadata() { Type = GenerationType.Native, Guid = guid });
+            }
+
+            return objects;
+        }
+
+        private void FilterObjects(List<PreviewMetadata> objects, List<PreviewMetadata> filteredObjects, List<PreviewMetadata> reusedPreviews)
+        {
+            if (Settings.OverwriteExisting || !CachingService.GetCachedMetadata(out var database))
+            {
+                filteredObjects.AddRange(objects);
+                return;
+            }
+
+            foreach (var obj in objects)
+            {
+                var matchingEntry = database.Previews.FirstOrDefault(x =>
+                x.Guid == obj.Guid
+                && x.Type == GenerationType.Native
+                && x.Exists());
+
+                if (matchingEntry == null)
+                {
+                    filteredObjects.Add(obj);
+                }
+                else
+                {
+                    reusedPreviews.Add(matchingEntry);
+                }
+            }
+        }
+
+        private bool ShouldHavePreview(UnityEngine.Object asset)
+        {
+            if (asset == null)
+                return false;
+
+            if (!AssetDatabase.IsMainAsset(asset))
+                return false;
+
+            switch (asset)
+            {
+                case AudioClip _:
+                case Material _:
+                case Mesh _:
+                case TerrainLayer _:
+                case Texture _:
+                case Tile _:
+                    return true;
+                case GameObject go:
+                    var renderers = go.GetComponentsInChildren<Renderer>();
+                    return renderers != null && renderers.Length > 0;
+                default:
+                    return false;
+            }
+        }
+
+        private PreviewMetadata WritePreviewToDisk(PreviewMetadata metadata, Texture2D texture)
+        {
+            var asset = AssetDatabase.LoadAssetAtPath<UnityEngine.Object>(AssetDatabase.GUIDToAssetPath(metadata.Guid));
+            var width = Mathf.Min(texture.width, 128);
+            var height = Mathf.Min(texture.height, 128);
+            var readableTexture = GraphicsUtility.ResizeTexture(texture, width, height);
+            var fileName = PreviewConvertUtility.ConvertFilenameWithExtension(asset, _nativeSettings.PreviewFileNamingFormat, _nativeSettings.Format);
+            var filePath = $"{_nativeSettings.OutputPath}/{fileName}";
+            var bytes = PreviewConvertUtility.ConvertTexture(readableTexture, _nativeSettings.Format);
+
+            File.WriteAllBytes(filePath, bytes);
+
+            metadata.Type = GenerationType.Native;
+            metadata.Name = asset.name;
+            metadata.Path = filePath;
+
+            return metadata;
+        }
+
+        private void WritePreviewsWithoutWaiting(List<PreviewMetadata> objects, out List<PreviewMetadata> generatedPreviews)
+        {
+            generatedPreviews = new List<PreviewMetadata>();
+
+            foreach (var obj in objects)
+            {
+                var texture = GetAssetPreviewFromGuid(obj.Guid);
+                if (texture == null)
+                    continue;
+
+                var generatedPreview = WritePreviewToDisk(obj, texture);
+                generatedPreviews.Add(generatedPreview);
+            }
+        }
+
+        private Texture2D GetAssetPreviewFromGuid(string guid)
+        {
+            var method = typeof(AssetPreview).GetMethod("GetAssetPreviewFromGUID", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static, null, new[] { typeof(string) }, null);
+            var args = new object[] { guid };
+
+            return method?.Invoke(null, args) as Texture2D;
+        }
+
+        private async Task WaitAndWritePreviewsChunked(List<PreviewMetadata> objects, List<PreviewMetadata> generatedPreviews)
+        {
+            var chunks = objects.Count / _nativeSettings.ChunkSize;
+            var remainder = objects.Count % _nativeSettings.ChunkSize;
+            if (remainder != 0)
+                chunks += 1;
+
+            for (int i = 0; i < chunks; i++)
+            {
+                var chunkObjects = new List<PreviewMetadata>();
+
+                for (int j = 0; j < _nativeSettings.ChunkSize; j++)
+                {
+                    var index = i * _nativeSettings.ChunkSize + j;
+                    if (index == objects.Count)
+                        break;
+
+                    chunkObjects.Add(objects[index]);
+                }
+
+                var generatedPreviewsChunk = new List<PreviewMetadata>();
+                await WaitAndWritePreviews(chunkObjects, generatedPreviewsChunk);
+                generatedPreviews.AddRange(generatedPreviewsChunk);
+            }
+        }
+
+        private async Task WaitAndWritePreviews(List<PreviewMetadata> objects, List<PreviewMetadata> generatedPreviews)
+        {
+            var initialObjectCount = objects.Count();
+            if (initialObjectCount == 0)
+                return;
+
+            await WaitAndWritePreviewIteration(objects, generatedPreviews);
+            var remainingObjectCount = objects.Count;
+
+            // First iteration may take longer to start loading objects
+            var firstIterationStartTime = EditorApplication.timeSinceStartup;
+            while (true)
+            {
+                if (remainingObjectCount < initialObjectCount)
+                    break;
+
+                if (EditorApplication.timeSinceStartup - firstIterationStartTime > InitialPreviewLoadingTimeoutSeconds)
+                    throw new Exception("Preview loading timed out.");
+
+                await WaitAndWritePreviewIteration(objects, generatedPreviews);
+                remainingObjectCount = objects.Count;
+            }
+
+            if (remainingObjectCount == 0)
+                return;
+
+            while (true)
+            {
+                await WaitForEndOfFrame(1);
+                await WaitAndWritePreviewIteration(objects, generatedPreviews);
+
+                // If no more previews are being loaded, try one more time before quitting
+                if (objects.Count == remainingObjectCount)
+                {
+                    await WaitForEndOfFrame(1);
+                    await WaitAndWritePreviewIteration(objects, generatedPreviews);
+
+                    if (objects.Count == remainingObjectCount)
+                    {
+                        var missingObjects = string.Join("\n", objects.Select(x => AssetDatabase.GUIDToAssetPath(x.Guid)));
+                        Debug.LogWarning($"Unity Editor failed to fetch previews for {objects.Count} objects:\n{missingObjects}");
+                        break;
+                    }
+                }
+
+                remainingObjectCount = objects.Count;
+
+                // Exit when all previews are loaded
+                if (remainingObjectCount == 0)
+                    break;
+            }
+        }
+
+        private async Task WaitAndWritePreviewIteration(List<PreviewMetadata> objects, List<PreviewMetadata> generatedPreviews)
+        {
+            var cacheSize = Mathf.Max(_nativeSettings.ChunkSize * 2, objects.Count() + _nativeSettings.ChunkSize);
+            AssetPreview.SetPreviewTextureCacheSize(cacheSize);
+
+            // Initial queueing
+            foreach (var obj in objects)
+            {
+                var asset = AssetDatabase.LoadAssetAtPath<UnityEngine.Object>(AssetDatabase.GUIDToAssetPath(obj.Guid));
+                AssetPreview.GetAssetPreview(asset);
+            }
+
+            await WaitForEndOfFrame();
+
+            // Waiting (NOTE: works inconsistently across Unity streams)
+            foreach (var obj in objects)
+            {
+                var asset = AssetDatabase.LoadAssetAtPath<UnityEngine.Object>(AssetDatabase.GUIDToAssetPath(obj.Guid));
+                if (AssetPreview.IsLoadingAssetPreview(asset.GetInstanceID()))
+                {
+                    await WaitForEndOfFrame();
+                }
+            }
+
+            // Writing
+            for (int i = 0; i < objects.Count; i++)
+            {
+                var obj = objects[i];
+
+                var asset = AssetDatabase.LoadAssetAtPath<UnityEngine.Object>(AssetDatabase.GUIDToAssetPath(obj.Guid));
+                var texture = AssetPreview.GetAssetPreview(asset);
+                if (texture == null)
+                    continue;
+
+                WritePreviewToDisk(obj, texture);
+                generatedPreviews.Add(obj);
+                _generatedPreviewsCount++;
+                OnProgressChanged?.Invoke((float)_generatedPreviewsCount / _totalPreviewsCount);
+            }
+
+            // Removing written objects from the list
+            for (int i = objects.Count - 1; i >= 0; i--)
+            {
+                if (objects[i].Exists())
+                    objects.RemoveAt(i);
+            }
+        }
+
+        private async Task WaitForEndOfFrame(double atLeastSeconds)
+        {
+            var startTime = EditorApplication.timeSinceStartup;
+            while (EditorApplication.timeSinceStartup - startTime <= atLeastSeconds)
+            {
+                await WaitForEndOfFrame();
+            }
+        }
+
+        private async Task WaitForEndOfFrame()
+        {
+            var isNextFrame = false;
+            EditorApplication.CallbackFunction callback = null;
+            callback = () =>
+            {
+                EditorApplication.update -= callback;
+                isNextFrame = true;
+            };
+
+            EditorApplication.update += callback;
+            while (!isNextFrame)
+                await Task.Yield();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/NativePreviewGenerator.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/NativePreviewGenerator.cs.meta
new file mode 100644
index 0000000..0d6454d
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/NativePreviewGenerator.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: dd6eeb2f97a2ed34db51ab5ac0b3ffa1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/NativePreviewGenerator.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/PreviewGeneratorBase.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/PreviewGeneratorBase.cs
new file mode 100644
index 0000000..258dc1e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/PreviewGeneratorBase.cs
@@ -0,0 +1,45 @@
+using AssetStoreTools.Previews.Data;
+using AssetStoreTools.Previews.Services;
+using System;
+using System.Threading.Tasks;
+
+namespace AssetStoreTools.Previews.Generators
+{
+    internal abstract class PreviewGeneratorBase : IPreviewGenerator
+    {
+        public PreviewGenerationSettings Settings { get; }
+        protected ICachingService CachingService;
+
+        public abstract event Action<float> OnProgressChanged;
+
+        public PreviewGeneratorBase(PreviewGenerationSettings settings)
+        {
+            Settings = settings;
+            CachingService = PreviewServiceProvider.Instance.GetService<ICachingService>();
+        }
+
+        public async Task<PreviewGenerationResult> Generate()
+        {
+            Validate();
+
+            var result = await GenerateImpl();
+            if (result.Success)
+            {
+                CachingService.CacheMetadata(result.GeneratedPreviews);
+            }
+
+            return result;
+        }
+
+        protected virtual void Validate()
+        {
+            if (Settings.InputPaths == null || Settings.InputPaths.Length == 0)
+                throw new ArgumentException("Input paths cannot be null");
+
+            if (string.IsNullOrEmpty(Settings.OutputPath))
+                throw new ArgumentException("Output path cannot be null");
+        }
+
+        protected abstract Task<PreviewGenerationResult> GenerateImpl();
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/PreviewGeneratorBase.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/PreviewGeneratorBase.cs.meta
new file mode 100644
index 0000000..36e64a2
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/PreviewGeneratorBase.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: cedf01448e0edcc4fb55f19f2e92b740
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Generators/PreviewGeneratorBase.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services.meta
new file mode 100644
index 0000000..55ebe0c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: aa18c820f185bfc4d8cd59e3418e2c4e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services/Caching.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services/Caching.meta
new file mode 100644
index 0000000..449835a
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services/Caching.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: eb61a60f2ff91a448a7808ef2a25f871
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services/Caching/CachingService.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services/Caching/CachingService.cs
new file mode 100644
index 0000000..64e9621
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services/Caching/CachingService.cs
@@ -0,0 +1,87 @@
+using AssetStoreTools.Previews.Data;
+using AssetStoreTools.Utility;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace AssetStoreTools.Previews.Services
+{
+    internal class CachingService : ICachingService
+    {
+        public void CacheMetadata(IEnumerable<PreviewMetadata> previews)
+        {
+            var updatedDatabase = UpdatePreviewDatabase(previews);
+
+            var serializerSettings = new JsonSerializerSettings()
+            {
+                ContractResolver = PreviewDatabaseContractResolver.Instance,
+                Converters = new List<JsonConverter>() { new StringEnumConverter() },
+                Formatting = Formatting.Indented
+            };
+
+            CacheUtil.CreateFileInTempCache(Constants.Previews.PreviewDatabaseFile, JsonConvert.SerializeObject(updatedDatabase, serializerSettings), true);
+        }
+
+        public bool GetCachedMetadata(out PreviewDatabase previewDatabase)
+        {
+            previewDatabase = null;
+            if (!CacheUtil.GetFileFromTempCache(Constants.Previews.PreviewDatabaseFile, out string filePath))
+                return false;
+
+            try
+            {
+                var serializerSettings = new JsonSerializerSettings()
+                {
+                    ContractResolver = PreviewDatabaseContractResolver.Instance,
+                    Converters = new List<JsonConverter>() { new StringEnumConverter() }
+                };
+
+                previewDatabase = JsonConvert.DeserializeObject<PreviewDatabase>(File.ReadAllText(filePath, Encoding.UTF8), serializerSettings);
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        private PreviewDatabase UpdatePreviewDatabase(IEnumerable<PreviewMetadata> previews)
+        {
+            PreviewDatabase database;
+            if (!GetCachedMetadata(out database))
+                database = new PreviewDatabase();
+
+            // Delete missing previews
+            for (int i = database.Previews.Count - 1; i >= 0; i--)
+            {
+                if (database.Previews[i].Exists())
+                    continue;
+
+                database.Previews.RemoveAt(i);
+            }
+
+            // Append new previews & Replace existing previews
+            foreach (var preview in previews)
+            {
+                var matchingPreviews = database.Previews.Where(x => x.Guid == preview.Guid).ToList();
+                foreach (var matchingPreview in matchingPreviews)
+                {
+                    // Delete previously generated preview of the same type
+                    if (matchingPreview.Type == preview.Type)
+                        database.Previews.Remove(matchingPreview);
+                    // Delete previously generated preview of a different type if the path matches
+                    else if (matchingPreview.Path.Equals(preview.Path))
+                        database.Previews.Remove(matchingPreview);
+                }
+
+                database.Previews.Add(preview);
+            }
+
+            database.Previews = database.Previews.OrderBy(x => x.Guid).ThenBy(x => x.Type).ToList();
+            return database;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services/Caching/CachingService.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services/Caching/CachingService.cs.meta
new file mode 100644
index 0000000..ef9417e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services/Caching/CachingService.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: e0b6cf909c8798b4590744959571a21f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services/Caching/CachingService.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services/Caching/ICachingService.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services/Caching/ICachingService.cs
new file mode 100644
index 0000000..38da070
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services/Caching/ICachingService.cs
@@ -0,0 +1,11 @@
+using AssetStoreTools.Previews.Data;
+using System.Collections.Generic;
+
+namespace AssetStoreTools.Previews.Services
+{
+    internal interface ICachingService : IPreviewService
+    {
+        void CacheMetadata(IEnumerable<PreviewMetadata> previews);
+        bool GetCachedMetadata(out PreviewDatabase previewDatabase);
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services/Caching/ICachingService.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services/Caching/ICachingService.cs.meta
new file mode 100644
index 0000000..50b3339
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services/Caching/ICachingService.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: eeaeae010299dcd489adb00dbf51b274
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services/Caching/ICachingService.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services/IPreviewService.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services/IPreviewService.cs
new file mode 100644
index 0000000..a287069
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services/IPreviewService.cs
@@ -0,0 +1,4 @@
+namespace AssetStoreTools.Previews.Services
+{
+    public interface IPreviewService { }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services/IPreviewService.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services/IPreviewService.cs.meta
new file mode 100644
index 0000000..28043dc
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services/IPreviewService.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 8c2761fe05638644d8e3a265865beef8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services/IPreviewService.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services/PreviewServiceProvider.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services/PreviewServiceProvider.cs
new file mode 100644
index 0000000..6487094
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services/PreviewServiceProvider.cs
@@ -0,0 +1,17 @@
+using AssetStoreTools.Utility;
+
+namespace AssetStoreTools.Previews.Services
+{
+    internal class PreviewServiceProvider : ServiceProvider<IPreviewService>
+    {
+        public static PreviewServiceProvider Instance => _instance ?? (_instance = new PreviewServiceProvider());
+        private static PreviewServiceProvider _instance;
+
+        private PreviewServiceProvider() { }
+
+        protected override void RegisterServices()
+        {
+            Register<ICachingService, CachingService>();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services/PreviewServiceProvider.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services/PreviewServiceProvider.cs.meta
new file mode 100644
index 0000000..0f5345e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services/PreviewServiceProvider.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: a19bf5a4e3e441047bbc1b894e2a1149
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Services/PreviewServiceProvider.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI.meta
new file mode 100644
index 0000000..67d04e3
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4738f3648c8368244a968bc840c1152b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data.meta
new file mode 100644
index 0000000..b302df5
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 23a2f4eadd444194a91ff4ce509e4798
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/AssetPreview.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/AssetPreview.cs
new file mode 100644
index 0000000..13075e2
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/AssetPreview.cs
@@ -0,0 +1,56 @@
+using AssetStoreTools.Previews.Data;
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using UnityEditor;
+using UnityEngine;
+
+namespace AssetStoreTools.Previews.UI.Data
+{
+    internal class AssetPreview : IAssetPreview
+    {
+        private PreviewMetadata _metadata;
+
+        private UnityEngine.Object _cachedAsset;
+        private string _cachedAssetPath;
+        private Texture2D _cachedTexture;
+
+        public UnityEngine.Object Asset => _cachedAsset ?? (_cachedAsset = AssetDatabase.LoadAssetAtPath<UnityEngine.Object>(AssetPath));
+        public string AssetPath => _cachedAssetPath ?? (_cachedAssetPath = AssetDatabase.GUIDToAssetPath(_metadata.Guid));
+
+        public AssetPreview(PreviewMetadata metadata)
+        {
+            _metadata = metadata;
+        }
+
+        public string GetAssetPath()
+        {
+            var assetPath = AssetDatabase.GUIDToAssetPath(_metadata.Guid);
+            return assetPath;
+        }
+
+        public async Task LoadImage(Action<Texture2D> onSuccess)
+        {
+            if (_cachedTexture == null)
+            {
+                if (!_metadata.Exists())
+                    return;
+
+                await Task.Yield();
+
+                try
+                {
+                    _cachedTexture = new Texture2D(1, 1);
+                    _cachedTexture.LoadImage(File.ReadAllBytes(_metadata.Path));
+                }
+                catch (Exception e)
+                {
+                    Debug.LogException(e);
+                    return;
+                }
+            }
+
+            onSuccess?.Invoke(_cachedTexture);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/AssetPreview.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/AssetPreview.cs.meta
new file mode 100644
index 0000000..9764acf
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/AssetPreview.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 739cf05c689204f4089fd0a6bddb8c3b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/AssetPreview.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/AssetPreviewCollection.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/AssetPreviewCollection.cs
new file mode 100644
index 0000000..337b0e5
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/AssetPreviewCollection.cs
@@ -0,0 +1,46 @@
+using AssetStoreTools.Previews.Data;
+using System;
+using System.Collections.Generic;
+
+namespace AssetStoreTools.Previews.UI.Data
+{
+    internal class AssetPreviewCollection : IAssetPreviewCollection
+    {
+        private GenerationType _generationType;
+        private List<IAssetPreview> _images;
+
+        public event Action OnCollectionChanged;
+
+        public AssetPreviewCollection()
+        {
+            _images = new List<IAssetPreview>();
+        }
+
+        public GenerationType GetGenerationType()
+        {
+            return _generationType;
+        }
+
+        public IEnumerable<IAssetPreview> GetPreviews()
+        {
+            return _images;
+        }
+
+        public void Refresh(GenerationType generationType, IEnumerable<PreviewMetadata> previews)
+        {
+            _images.Clear();
+
+            _generationType = generationType;
+
+            foreach (var entry in previews)
+            {
+                if (!entry.Exists())
+                    continue;
+
+                _images.Add(new AssetPreview(entry));
+            }
+
+            OnCollectionChanged?.Invoke();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/AssetPreviewCollection.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/AssetPreviewCollection.cs.meta
new file mode 100644
index 0000000..319746a
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/AssetPreviewCollection.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 9b1a0db8710933048b49dcca463fb8fd
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/AssetPreviewCollection.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/IAssetPreview.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/IAssetPreview.cs
new file mode 100644
index 0000000..7da0bc4
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/IAssetPreview.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Threading.Tasks;
+using UnityEngine;
+
+namespace AssetStoreTools.Previews.UI.Data
+{
+    internal interface IAssetPreview
+    {
+        UnityEngine.Object Asset { get; }
+        string GetAssetPath();
+        Task LoadImage(Action<Texture2D> onSuccess);
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/IAssetPreview.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/IAssetPreview.cs.meta
new file mode 100644
index 0000000..3bf6b86
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/IAssetPreview.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 0f9373dfc16d0fa4794dac29b75204ec
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/IAssetPreview.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/IAssetPreviewCollection.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/IAssetPreviewCollection.cs
new file mode 100644
index 0000000..0665821
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/IAssetPreviewCollection.cs
@@ -0,0 +1,15 @@
+using AssetStoreTools.Previews.Data;
+using System;
+using System.Collections.Generic;
+
+namespace AssetStoreTools.Previews.UI.Data
+{
+    internal interface IAssetPreviewCollection
+    {
+        event Action OnCollectionChanged;
+
+        GenerationType GetGenerationType();
+        IEnumerable<IAssetPreview> GetPreviews();
+        void Refresh(GenerationType generationType, IEnumerable<PreviewMetadata> previews);
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/IAssetPreviewCollection.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/IAssetPreviewCollection.cs.meta
new file mode 100644
index 0000000..60da018
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/IAssetPreviewCollection.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: fc9d9abd80c070f44ac49d5ce23d2fc0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/IAssetPreviewCollection.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/IPreviewGeneratorSettings.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/IPreviewGeneratorSettings.cs
new file mode 100644
index 0000000..63be47f
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/IPreviewGeneratorSettings.cs
@@ -0,0 +1,27 @@
+using AssetStoreTools.Previews.Data;
+using AssetStoreTools.Previews.Generators;
+using System;
+using System.Collections.Generic;
+
+namespace AssetStoreTools.Previews.UI.Data
+{
+    internal interface IPreviewGeneratorSettings
+    {
+        event Action OnGenerationTypeChanged;
+        event Action OnGenerationPathsChanged;
+
+        void LoadSettings(PreviewGenerationSettings settings);
+
+        GenerationType GetGenerationType();
+        void SetGenerationType(GenerationType type);
+        List<GenerationType> GetAvailableGenerationTypes();
+
+        List<string> GetGenerationPaths();
+        void AddGenerationPath(string path);
+        void RemoveGenerationPath(string path);
+        void ClearGenerationPaths();
+        bool IsGenerationPathValid(string path, out string error);
+
+        IPreviewGenerator CreateGenerator();
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/IPreviewGeneratorSettings.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/IPreviewGeneratorSettings.cs.meta
new file mode 100644
index 0000000..e3ecce7
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/IPreviewGeneratorSettings.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 55c9fcde15f06754588fd02fb8b99a60
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/IPreviewGeneratorSettings.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/PreviewGeneratorSettings.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/PreviewGeneratorSettings.cs
new file mode 100644
index 0000000..0863eaa
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/PreviewGeneratorSettings.cs
@@ -0,0 +1,212 @@
+using AssetStoreTools.Previews.Data;
+using AssetStoreTools.Previews.Generators;
+using AssetStoreTools.Utility;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using UnityEngine;
+
+namespace AssetStoreTools.Previews.UI.Data
+{
+    internal class PreviewGeneratorSettings : IPreviewGeneratorSettings
+    {
+        private readonly GenerationType[] _availableGenerationTypes = new GenerationType[]
+        {
+            GenerationType.Native,
+            GenerationType.Custom
+        };
+
+        private List<string> _inputPaths;
+        private GenerationType _generationType;
+
+        public event Action OnGenerationTypeChanged;
+        public event Action OnGenerationPathsChanged;
+
+        public PreviewGeneratorSettings()
+        {
+            _inputPaths = new List<string>();
+            _generationType = GenerationType.Native;
+        }
+
+        public void LoadSettings(PreviewGenerationSettings settings)
+        {
+            if (settings == null)
+                return;
+
+            _inputPaths = settings.InputPaths.ToList();
+            OnGenerationPathsChanged?.Invoke();
+
+            switch (settings)
+            {
+                case NativePreviewGenerationSettings _:
+                    _generationType = GenerationType.Native;
+                    break;
+                case CustomPreviewGenerationSettings _:
+                    _generationType = GenerationType.Custom;
+                    break;
+                default:
+                    return;
+            }
+
+            OnGenerationTypeChanged?.Invoke();
+        }
+
+        public GenerationType GetGenerationType()
+        {
+            return _generationType;
+        }
+
+        public void SetGenerationType(GenerationType type)
+        {
+            _generationType = type;
+            OnGenerationTypeChanged?.Invoke();
+        }
+
+        public List<GenerationType> GetAvailableGenerationTypes()
+        {
+            return _availableGenerationTypes.ToList();
+        }
+
+        public List<string> GetGenerationPaths()
+        {
+            return _inputPaths;
+        }
+
+        public void AddGenerationPath(string path)
+        {
+            if (string.IsNullOrEmpty(path))
+                return;
+
+            if (_inputPaths.Contains(path))
+                return;
+
+            // Prevent redundancy for new paths
+            var existingPath = _inputPaths.FirstOrDefault(x => path.StartsWith(x + "/"));
+            if (existingPath != null)
+            {
+                Debug.LogWarning($"Path '{path}' is already included with existing path: '{existingPath}'");
+                return;
+            }
+
+            // Prevent redundancy for already added paths
+            var redundantPaths = _inputPaths.Where(x => x.StartsWith(path + "/")).ToArray();
+            foreach (var redundantPath in redundantPaths)
+            {
+                Debug.LogWarning($"Existing validation path '{redundantPath}' has been made redundant by the inclusion of new validation path: '{path}'");
+                _inputPaths.Remove(redundantPath);
+            }
+
+            _inputPaths.Add(path);
+
+            OnGenerationPathsChanged?.Invoke();
+        }
+
+        public void RemoveGenerationPath(string path)
+        {
+            if (!_inputPaths.Contains(path))
+                return;
+
+            _inputPaths.Remove(path);
+
+            OnGenerationPathsChanged?.Invoke();
+        }
+
+        public void ClearGenerationPaths()
+        {
+            if (_inputPaths.Count == 0)
+                return;
+
+            _inputPaths.Clear();
+
+            OnGenerationPathsChanged?.Invoke();
+        }
+
+        public bool IsGenerationPathValid(string path, out string error)
+        {
+            error = string.Empty;
+
+            if (string.IsNullOrEmpty(path))
+            {
+                error = "Path cannot be empty";
+                return false;
+            }
+
+            var isAssetsPath = path.StartsWith("Assets/")
+                || path.Equals("Assets");
+            var isPackagePath = PackageUtility.GetPackageByManifestPath($"{path}/package.json", out _);
+
+            if (!isAssetsPath && !isPackagePath)
+            {
+                error = "Selected path must be within the Assets folder or point to a root path of a package";
+                return false;
+            }
+
+            if (!Directory.Exists(path))
+            {
+                error = "Path does not exist";
+                return false;
+            }
+
+            if (path.Split('/').Any(x => x.StartsWith(".") || x.EndsWith("~")))
+            {
+                error = $"Path '{path}' cannot be selected as it is a hidden folder and not part of the Asset Database";
+                return false;
+            }
+
+            return true;
+        }
+
+        public IPreviewGenerator CreateGenerator()
+        {
+            switch (_generationType)
+            {
+                case GenerationType.Native:
+                    return CreateNativeGenerator();
+                case GenerationType.Custom:
+                    return CreateCustomGenerator();
+                default:
+                    throw new NotImplementedException("Undefined generator type");
+            }
+        }
+
+        private IPreviewGenerator CreateNativeGenerator()
+        {
+            var settings = new NativePreviewGenerationSettings()
+            {
+                InputPaths = _inputPaths.ToArray(),
+                OutputPath = Constants.Previews.Native.DefaultOutputPath,
+                PreviewFileNamingFormat = Constants.Previews.DefaultFileNameFormat,
+                Format = Constants.Previews.Native.DefaultFormat,
+                WaitForPreviews = Constants.Previews.Native.DefaultWaitForPreviews,
+                ChunkedPreviewLoading = Constants.Previews.Native.DefaultChunkedPreviewLoading,
+                ChunkSize = Constants.Previews.Native.DefaultChunkSize,
+                OverwriteExisting = true
+            };
+
+            return new NativePreviewGenerator(settings);
+        }
+
+        private IPreviewGenerator CreateCustomGenerator()
+        {
+            var settings = new CustomPreviewGenerationSettings()
+            {
+                InputPaths = _inputPaths.ToArray(),
+                OutputPath = Constants.Previews.Custom.DefaultOutputPath,
+                Width = Constants.Previews.Custom.DefaultWidth,
+                Height = Constants.Previews.Custom.DefaultHeight,
+                Depth = Constants.Previews.Custom.DefaultDepth,
+                NativeWidth = Constants.Previews.Custom.DefaultNativeWidth,
+                NativeHeight = Constants.Previews.Custom.DefaultNativeHeight,
+                PreviewFileNamingFormat = Constants.Previews.DefaultFileNameFormat,
+                Format = Constants.Previews.Custom.DefaultFormat,
+                AudioSampleColor = Constants.Previews.Custom.DefaultAudioSampleColor,
+                AudioBackgroundColor = Constants.Previews.Custom.DefaultAudioBackgroundColor,
+                OverwriteExisting = true
+            };
+
+            var generator = new CustomPreviewGenerator(settings);
+            return generator;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/PreviewGeneratorSettings.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/PreviewGeneratorSettings.cs.meta
new file mode 100644
index 0000000..b57c82a
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/PreviewGeneratorSettings.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 9e6f754b1179d8d4cb40f62692619a63
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Data/PreviewGeneratorSettings.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements.meta
new file mode 100644
index 0000000..d81acd5
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 700ec0107b011824892281e880281bb1
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/AssetPreviewElement.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/AssetPreviewElement.cs
new file mode 100644
index 0000000..7abb725
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/AssetPreviewElement.cs
@@ -0,0 +1,83 @@
+using AssetStoreTools.Previews.UI.Data;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Previews.UI.Elements
+{
+    internal class AssetPreviewElement : VisualElement
+    {
+        // Data
+        private IAssetPreview _assetPreview;
+
+        // UI
+        private Image _image;
+        private Label _label;
+
+        public AssetPreviewElement()
+        {
+            AddToClassList("preview-list-image");
+
+            Create();
+
+            RegisterCallback<MouseDownEvent>(OnImageClicked);
+        }
+
+        private void Create()
+        {
+            CreateFiller();
+            CreateImage();
+            CreateLabel();
+        }
+
+        private void CreateImage()
+        {
+            _image = new Image();
+            Add(_image);
+        }
+
+        private void CreateFiller()
+        {
+            var filler = new VisualElement() { name = "Filler" };
+            Add(filler);
+        }
+
+        private void CreateLabel()
+        {
+            _label = new Label();
+            Add(_label);
+        }
+
+        private void SetImage(Texture2D texture)
+        {
+            _image.style.width = texture.width < 128 ? texture.width : 128;
+            _image.style.height = texture.height < 128 ? texture.height : 128;
+            _image.style.backgroundImage = texture;
+        }
+
+        private void OnImageClicked(MouseDownEvent _)
+        {
+            EditorGUIUtility.PingObject(_assetPreview.Asset);
+        }
+
+        public void SetSource(IAssetPreview assetPreview)
+        {
+            _assetPreview = assetPreview;
+            _assetPreview.LoadImage(SetImage);
+
+            var assetPath = _assetPreview.GetAssetPath();
+
+            if (string.IsNullOrEmpty(assetPath))
+            {
+                _label.text = "[Missing]";
+                tooltip = "This asset has been deleted";
+                return;
+            }
+
+            var assetNameWithExtension = assetPath.Split('/').Last();
+            _label.text = assetNameWithExtension;
+            tooltip = assetPath;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/AssetPreviewElement.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/AssetPreviewElement.cs.meta
new file mode 100644
index 0000000..fec756c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/AssetPreviewElement.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 28891b8cff841a44eb508494d62c190c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/AssetPreviewElement.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/GridListElement.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/GridListElement.cs
new file mode 100644
index 0000000..085bea2
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/GridListElement.cs
@@ -0,0 +1,140 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Previews.UI.Elements
+{
+    internal class GridListElement : VisualElement
+    {
+        public int ElementWidth;
+        public int ElementHeight;
+        private int _visibilityHeadroom => ElementHeight;
+
+        public IList ItemSource;
+        public Func<VisualElement> MakeItem;
+        public Action<VisualElement, int> BindItem;
+
+        private ScrollView _scrollView;
+
+        public GridListElement()
+        {
+            style.flexGrow = 1;
+
+            Create();
+
+            _scrollView.contentViewport.RegisterCallback<GeometryChangedEvent>(OnGeometryChanged);
+            _scrollView.verticalScroller.valueChanged += OnVerticalScroll;
+#if UNITY_2021_1_OR_NEWER
+            _scrollView.horizontalScrollerVisibility = ScrollerVisibility.Hidden;
+#else
+            _scrollView.showHorizontal = false;
+#endif
+        }
+
+        private void Create()
+        {
+            _scrollView = new ScrollView();
+            Add(_scrollView);
+        }
+
+        private void OnGeometryChanged(GeometryChangedEvent evt)
+        {
+            Redraw();
+        }
+
+        private void OnVerticalScroll(float value)
+        {
+            Redraw();
+        }
+
+        public void Redraw()
+        {
+            if (ElementWidth == 0
+                || ElementHeight == 0
+                || ItemSource == null
+                || MakeItem == null
+                || BindItem == null)
+                return;
+
+            _scrollView.Clear();
+
+            var rowCapacity = Mathf.FloorToInt(_scrollView.contentContainer.worldBound.width / ElementWidth);
+            if (rowCapacity == 0)
+                rowCapacity = 1;
+
+            var totalRequiredRows = ItemSource.Count / rowCapacity;
+            if (ItemSource.Count % rowCapacity != 0)
+                totalRequiredRows++;
+
+            _scrollView.contentContainer.style.height = totalRequiredRows * ElementHeight;
+
+            var visibleRows = new List<int>();
+            for (int i = 0; i < totalRequiredRows; i++)
+            {
+                var visible = IsRowVisible(i);
+                if (!visible)
+                    continue;
+
+                var rowElement = CreateRow(i);
+
+                for (int j = 0; j < rowCapacity; j++)
+                {
+                    var elementIndex = i * rowCapacity + j;
+                    if (elementIndex >= ItemSource.Count)
+                    {
+                        rowElement.Add(CreateFillerElement());
+                        continue;
+                    }
+
+                    var element = MakeItem?.Invoke();
+                    BindItem?.Invoke(element, elementIndex);
+
+                    rowElement.Add(element);
+                }
+
+                _scrollView.Add(rowElement);
+            }
+        }
+
+        private bool IsRowVisible(int rowIndex)
+        {
+            var contentStartY = _scrollView.contentContainer.worldBound.yMin;
+            var visibleContentMinY = _scrollView.contentViewport.worldBound.yMin - _visibilityHeadroom;
+            var visibleContentMaxY = _scrollView.contentViewport.worldBound.yMax + _visibilityHeadroom;
+            if (_scrollView.contentViewport.worldBound.height == 0)
+                visibleContentMaxY = this.worldBound.yMax;
+
+            var rowMinY = (rowIndex * ElementHeight) + contentStartY;
+            var rowMaxY = (rowIndex * ElementHeight) + ElementHeight + contentStartY;
+
+            var fullyVisible = rowMinY >= visibleContentMinY && rowMaxY <= visibleContentMaxY;
+            var partiallyAbove = rowMinY < visibleContentMinY && rowMaxY > visibleContentMinY;
+            var partiallyBelow = rowMaxY > visibleContentMaxY && rowMinY < visibleContentMaxY;
+
+            return fullyVisible || partiallyAbove || partiallyBelow;
+        }
+
+        private VisualElement CreateRow(int rowIndex)
+        {
+            var rowElement = new VisualElement() { name = $"Row {rowIndex}" };
+            rowElement.style.flexDirection = FlexDirection.Row;
+            rowElement.style.position = Position.Absolute;
+            rowElement.style.top = ElementHeight * rowIndex;
+            rowElement.style.width = _scrollView.contentViewport.worldBound.width;
+            rowElement.style.justifyContent = Justify.SpaceAround;
+
+            return rowElement;
+        }
+
+        private VisualElement CreateFillerElement()
+        {
+            var element = new VisualElement();
+            element.style.width = ElementWidth;
+            element.style.height = ElementHeight;
+
+            return element;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/GridListElement.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/GridListElement.cs.meta
new file mode 100644
index 0000000..a439c55
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/GridListElement.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 81d9f779e8c2a464cbdc1e39a4864803
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/GridListElement.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewCollectionElement.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewCollectionElement.cs
new file mode 100644
index 0000000..284093f
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewCollectionElement.cs
@@ -0,0 +1,116 @@
+using AssetStoreTools.Previews.Data;
+using AssetStoreTools.Previews.UI.Data;
+using System.Linq;
+using UnityEditor.SceneManagement;
+using UnityEngine;
+using UnityEngine.Events;
+using UnityEngine.SceneManagement;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Previews.UI.Elements
+{
+    internal class PreviewCollectionElement : VisualElement
+    {
+        // Data
+        private IAssetPreviewCollection _collection;
+
+        // UI
+        private Label _previewCountLabel;
+        private GridListElement _gridListElement;
+
+        public PreviewCollectionElement(IAssetPreviewCollection collection)
+        {
+            AddToClassList("preview-list");
+
+            _collection = collection;
+            _collection.OnCollectionChanged += RefreshList;
+
+            Create();
+            RefreshList();
+
+            SubscribeToSceneChanges();
+        }
+
+        private void Create()
+        {
+            CreateLabel();
+            CreateGridListElement();
+        }
+
+        private void CreateLabel()
+        {
+            _previewCountLabel = new Label();
+            _previewCountLabel.style.display = DisplayStyle.None;
+            Add(_previewCountLabel);
+        }
+
+        private void CreateGridListElement()
+        {
+            _gridListElement = new GridListElement();
+            _gridListElement.MakeItem = CreatePreview;
+            _gridListElement.BindItem = BindPreview;
+            _gridListElement.ElementWidth = 140 + 10; // Accounting for margin style
+            _gridListElement.ElementHeight = 160 + 10; // Accounting for margin style
+            Add(_gridListElement);
+        }
+
+        private VisualElement CreatePreview()
+        {
+            var preview = new AssetPreviewElement();
+            return preview;
+        }
+
+        private void BindPreview(VisualElement element, int index)
+        {
+            var previewElement = (AssetPreviewElement)element;
+            var preview = _collection.GetPreviews().ToList()[index];
+            previewElement.SetSource(preview);
+        }
+
+        private void RefreshList()
+        {
+            var type = _collection.GetGenerationType();
+            var items = _collection.GetPreviews().ToList();
+            _previewCountLabel.text = $"Displaying {items.Count} {ConvertGenerationTypeName(type)} previews";
+            _previewCountLabel.style.display = DisplayStyle.Flex;
+            _previewCountLabel.style.alignSelf = Align.Center;
+            _previewCountLabel.style.marginBottom = 10;
+            _previewCountLabel.style.unityFontStyleAndWeight = FontStyle.Bold;
+
+            _gridListElement.ItemSource = items;
+            _gridListElement.Redraw();
+        }
+
+        private string ConvertGenerationTypeName(GenerationType type)
+        {
+            switch (type)
+            {
+                case GenerationType.Custom:
+                    return "high resolution";
+                default:
+                    return type.ToString().ToLower();
+            }
+        }
+
+        private void SubscribeToSceneChanges()
+        {
+            var windowToSubscribeTo = Resources.FindObjectsOfTypeAll<PreviewGeneratorWindow>().FirstOrDefault();
+            UnityAction<Scene, Scene> sceneChanged = null;
+            sceneChanged = new UnityAction<Scene, Scene>((_, __) => RefreshObjects(windowToSubscribeTo));
+            EditorSceneManager.activeSceneChangedInEditMode += sceneChanged;
+
+            void RefreshObjects(PreviewGeneratorWindow subscribedWindow)
+            {
+                // Remove callback if preview generator window instance changed
+                var activeWindow = Resources.FindObjectsOfTypeAll<PreviewGeneratorWindow>().FirstOrDefault();
+                if (subscribedWindow == null || subscribedWindow != activeWindow)
+                {
+                    EditorSceneManager.activeSceneChangedInEditMode -= sceneChanged;
+                    return;
+                }
+
+                RefreshList();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewCollectionElement.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewCollectionElement.cs.meta
new file mode 100644
index 0000000..fc6e1c1
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewCollectionElement.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 842a11e046ca5284d9de9f4a05b1fa26
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewCollectionElement.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewGenerateButtonElement.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewGenerateButtonElement.cs
new file mode 100644
index 0000000..988814d
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewGenerateButtonElement.cs
@@ -0,0 +1,50 @@
+using AssetStoreTools.Previews.UI.Data;
+using System;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Previews.UI.Elements
+{
+    internal class PreviewGenerateButtonElement : VisualElement
+    {
+        // Data
+        private IPreviewGeneratorSettings _settings;
+
+        // UI
+        private Button _generateButton;
+
+        public event Action OnGenerate;
+
+        public PreviewGenerateButtonElement(IPreviewGeneratorSettings settings)
+        {
+            _settings = settings;
+            _settings.OnGenerationPathsChanged += GenerationPathsChanged;
+
+            Create();
+            Deserialize();
+        }
+
+        private void Create()
+        {
+            _generateButton = new Button(Validate) { text = "Generate" };
+            _generateButton.AddToClassList("preview-generate-button");
+
+            Add(_generateButton);
+        }
+
+        private void Validate()
+        {
+            OnGenerate?.Invoke();
+        }
+
+        private void GenerationPathsChanged()
+        {
+            var inputPathsPresent = _settings.GetGenerationPaths().Count > 0;
+            _generateButton.SetEnabled(inputPathsPresent);
+        }
+
+        private void Deserialize()
+        {
+            GenerationPathsChanged();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewGenerateButtonElement.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewGenerateButtonElement.cs.meta
new file mode 100644
index 0000000..57303ac
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewGenerateButtonElement.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 1c8fbb0b13ba7d3479c0867c440821e6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewGenerateButtonElement.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewGeneratorPathsElement.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewGeneratorPathsElement.cs
new file mode 100644
index 0000000..55220fb
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewGeneratorPathsElement.cs
@@ -0,0 +1,122 @@
+using AssetStoreTools.Previews.UI.Data;
+using AssetStoreTools.Utility;
+using UnityEditor;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Validator.UI.Elements
+{
+    internal class PreviewGeneratorPathsElement : VisualElement
+    {
+        // Data
+        private IPreviewGeneratorSettings _settings;
+
+        // UI
+        private ScrollView _pathBoxScrollView;
+
+        public PreviewGeneratorPathsElement(IPreviewGeneratorSettings settings)
+        {
+            AddToClassList("preview-paths");
+
+            _settings = settings;
+            _settings.OnGenerationPathsChanged += InputPathsChanged;
+
+            Create();
+            Deserialize();
+        }
+
+        private void Create()
+        {
+            var pathSelectionRow = new VisualElement();
+            pathSelectionRow.AddToClassList("preview-settings-selection-row");
+
+            VisualElement labelHelpRow = new VisualElement();
+            labelHelpRow.AddToClassList("preview-settings-selection-label-help-row");
+            labelHelpRow.style.alignSelf = Align.FlexStart;
+
+            Label pathLabel = new Label { text = "Input paths" };
+            Image pathLabelTooltip = new Image
+            {
+                tooltip = "Select the folder (or multiple folders) to generate asset previews for."
+            };
+
+            labelHelpRow.Add(pathLabel);
+            labelHelpRow.Add(pathLabelTooltip);
+
+            var fullPathBox = new VisualElement() { name = "PreviewPaths" };
+            fullPathBox.AddToClassList("preview-paths-box");
+
+            _pathBoxScrollView = new ScrollView { name = "PreviewPathsScrollView" };
+            _pathBoxScrollView.AddToClassList("preview-paths-scroll-view");
+
+            VisualElement scrollViewBottomRow = new VisualElement();
+            scrollViewBottomRow.AddToClassList("preview-paths-scroll-view-bottom-row");
+
+            var addExtraPathsButton = new Button(BrowsePath) { text = "Add a path" };
+            addExtraPathsButton.AddToClassList("preview-paths-add-button");
+            scrollViewBottomRow.Add(addExtraPathsButton);
+
+            fullPathBox.Add(_pathBoxScrollView);
+            fullPathBox.Add(scrollViewBottomRow);
+
+            pathSelectionRow.Add(labelHelpRow);
+            pathSelectionRow.Add(fullPathBox);
+
+            Add(pathSelectionRow);
+        }
+
+        private VisualElement CreateSinglePathElement(string path)
+        {
+            var validationPath = new VisualElement();
+            validationPath.AddToClassList("preview-paths-path-row");
+
+            var folderPathLabel = new Label(path);
+            folderPathLabel.AddToClassList("preview-paths-path-row-input-field");
+
+            var removeButton = new Button(() =>
+            {
+                _settings.RemoveGenerationPath(path);
+            });
+            removeButton.text = "X";
+            removeButton.AddToClassList("preview-paths-path-row-remove-button");
+
+            validationPath.Add(folderPathLabel);
+            validationPath.Add(removeButton);
+
+            return validationPath;
+        }
+
+        private void BrowsePath()
+        {
+            string absolutePath = EditorUtility.OpenFolderPanel("Select a directory", "Assets", "");
+
+            if (string.IsNullOrEmpty(absolutePath))
+                return;
+
+            var relativePath = FileUtility.AbsolutePathToRelativePath(absolutePath, ASToolsPreferences.Instance.EnableSymlinkSupport);
+
+            if (!_settings.IsGenerationPathValid(relativePath, out var error))
+            {
+                EditorUtility.DisplayDialog("Invalid path", error, "OK");
+                return;
+            }
+
+            _settings.AddGenerationPath(relativePath);
+        }
+
+        private void InputPathsChanged()
+        {
+            var inputPaths = _settings.GetGenerationPaths();
+
+            _pathBoxScrollView.Clear();
+            foreach (var path in inputPaths)
+            {
+                _pathBoxScrollView.Add(CreateSinglePathElement(path));
+            }
+        }
+
+        private void Deserialize()
+        {
+            InputPathsChanged();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewGeneratorPathsElement.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewGeneratorPathsElement.cs.meta
new file mode 100644
index 0000000..efdee4a
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewGeneratorPathsElement.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: cd3e3f7fbfc5f1e46835438be2756746
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewGeneratorPathsElement.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewGeneratorSettingsElement.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewGeneratorSettingsElement.cs
new file mode 100644
index 0000000..0e97061
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewGeneratorSettingsElement.cs
@@ -0,0 +1,99 @@
+using AssetStoreTools.Previews.Data;
+using AssetStoreTools.Previews.UI.Data;
+using AssetStoreTools.Validator.UI.Elements;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Previews.UI.Elements
+{
+    internal class PreviewGeneratorSettingsElement : VisualElement
+    {
+        // Data
+        private IPreviewGeneratorSettings _settings;
+
+        // UI
+        private PreviewGeneratorPathsElement _previewPathsElement;
+        private ToolbarMenu _generationTypeMenu;
+
+        public PreviewGeneratorSettingsElement(IPreviewGeneratorSettings settings)
+        {
+            AddToClassList("preview-settings");
+
+            _settings = settings;
+            _settings.OnGenerationTypeChanged += GenerationTypeChanged;
+
+            Create();
+            Deserialize();
+        }
+
+        private void Create()
+        {
+            CreateGenerationType();
+            CreateInputPathsElement();
+        }
+
+        private void CreateInputPathsElement()
+        {
+            _previewPathsElement = new PreviewGeneratorPathsElement(_settings);
+            Add(_previewPathsElement);
+        }
+
+        private void CreateGenerationType()
+        {
+            var typeSelectionBox = new VisualElement();
+            typeSelectionBox.AddToClassList("preview-settings-selection-row");
+
+            VisualElement labelHelpRow = new VisualElement();
+            labelHelpRow.AddToClassList("preview-settings-selection-label-help-row");
+
+            Label generationTypeLabel = new Label { text = "Generation type" };
+            Image categoryLabelTooltip = new Image
+            {
+                tooltip = "Choose the generation type for your previews.\n\n" +
+                "- Native: retrieve previews from the Asset Database which are generated by Unity Editor internally\n" +
+                "- High Resolution (experimental): generate previews using a custom implementation. Resulting previews are of higher resolution " +
+                "than those generated by Unity Editor. Note that they may look slightly different from native previews"
+            };
+
+            labelHelpRow.Add(generationTypeLabel);
+            labelHelpRow.Add(categoryLabelTooltip);
+
+            _generationTypeMenu = new ToolbarMenu { name = "GenerationTypeMenu" };
+            _generationTypeMenu.AddToClassList("preview-settings-selection-dropdown");
+
+            typeSelectionBox.Add(labelHelpRow);
+            typeSelectionBox.Add(_generationTypeMenu);
+
+            // Append available categories
+            var types = _settings.GetAvailableGenerationTypes();
+            foreach (var t in types)
+            {
+                _generationTypeMenu.menu.AppendAction(ConvertGenerationTypeName(t), _ => _settings.SetGenerationType(t));
+            }
+
+            Add(typeSelectionBox);
+        }
+
+        private string ConvertGenerationTypeName(GenerationType type)
+        {
+            switch (type)
+            {
+                case GenerationType.Custom:
+                    return "High Resolution (experimental)";
+                default:
+                    return type.ToString();
+            }
+        }
+
+        private void GenerationTypeChanged()
+        {
+            var t = _settings.GetGenerationType();
+            _generationTypeMenu.text = ConvertGenerationTypeName(t);
+        }
+
+        private void Deserialize()
+        {
+            GenerationTypeChanged();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewGeneratorSettingsElement.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewGeneratorSettingsElement.cs.meta
new file mode 100644
index 0000000..acda521
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewGeneratorSettingsElement.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 6f38de8a438b8c94a81fe5f2cc45c110
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewGeneratorSettingsElement.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewWindowDescriptionElement.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewWindowDescriptionElement.cs
new file mode 100644
index 0000000..8e0f523
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewWindowDescriptionElement.cs
@@ -0,0 +1,87 @@
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Previews.UI.Elements
+{
+    internal class PreviewWindowDescriptionElement : VisualElement
+    {
+        private const string DescriptionFoldoutText = "Generate and inspect asset preview images to be displayed in your package listing page on the Asset Store.";
+        private const string DescriptionFoldoutContentText = "Images generated in this window will be reused when exporting a package. Any missing images generated during the package export process will also appear here.\n\n" +
+            "Preview images are displayed on the Asset Store under the 'Package Content' section of the package listing. " +
+            "They are also displayed in the package importer window that appears during the package import process. " +
+            "Note that these images will not replace the images used for the assets in the Project window after the package gets imported.";
+
+        private VisualElement _descriptionSimpleContainer;
+        private Button _showMoreButton;
+
+        private VisualElement _descriptionFullContainer;
+        private Button _showLessButton;
+
+        public PreviewWindowDescriptionElement()
+        {
+            AddToClassList("asset-preview-description");
+            Create();
+        }
+
+        private void Create()
+        {
+            CreateSimpleDescription();
+            CreateFullDescription();
+        }
+
+        private void CreateSimpleDescription()
+        {
+            _descriptionSimpleContainer = new VisualElement();
+            _descriptionSimpleContainer.AddToClassList("asset-preview-description-simple-container");
+
+            var simpleDescription = new Label(DescriptionFoldoutText);
+            simpleDescription.AddToClassList("asset-preview-description-simple-label");
+
+            _showMoreButton = new Button(ToggleFullDescription) { text = "Show more..." };
+            _showMoreButton.AddToClassList("asset-preview-description-hyperlink-button");
+            _showMoreButton.AddToClassList("asset-preview-description-show-button");
+
+            _descriptionSimpleContainer.Add(simpleDescription);
+            _descriptionSimpleContainer.Add(_showMoreButton);
+
+            Add(_descriptionSimpleContainer);
+        }
+
+        private void CreateFullDescription()
+        {
+            _descriptionFullContainer = new VisualElement();
+            _descriptionFullContainer.AddToClassList("asset-preview-description-full-container");
+
+            var validatorDescription = new Label()
+            {
+                text = DescriptionFoldoutContentText
+            };
+            validatorDescription.AddToClassList("asset-preview-description-full-label");
+
+            _showLessButton = new Button(ToggleFullDescription) { text = "Show less..." };
+            _showLessButton.AddToClassList("asset-preview-description-hide-button");
+            _showLessButton.AddToClassList("asset-preview-description-hyperlink-button");
+
+            _descriptionFullContainer.Add(validatorDescription);
+            _descriptionFullContainer.Add(_showLessButton);
+
+            _descriptionFullContainer.style.display = DisplayStyle.None;
+            Add(_descriptionFullContainer);
+        }
+
+        private void ToggleFullDescription()
+        {
+            var displayFullDescription = _descriptionFullContainer.style.display == DisplayStyle.None;
+
+            if (displayFullDescription)
+            {
+                _showMoreButton.style.display = DisplayStyle.None;
+                _descriptionFullContainer.style.display = DisplayStyle.Flex;
+            }
+            else
+            {
+                _showMoreButton.style.display = DisplayStyle.Flex;
+                _descriptionFullContainer.style.display = DisplayStyle.None;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewWindowDescriptionElement.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewWindowDescriptionElement.cs.meta
new file mode 100644
index 0000000..5f0631e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewWindowDescriptionElement.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 2cab289a87b0ba74f89cb458ff6d44f8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Elements/PreviewWindowDescriptionElement.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/PreviewGeneratorWindow.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/PreviewGeneratorWindow.cs
new file mode 100644
index 0000000..1dc0184
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/PreviewGeneratorWindow.cs
@@ -0,0 +1,51 @@
+using AssetStoreTools.Previews.Data;
+using AssetStoreTools.Previews.Services;
+using AssetStoreTools.Previews.UI.Views;
+using AssetStoreTools.Utility;
+using UnityEditor.UIElements;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Previews.UI
+{
+    internal class PreviewGeneratorWindow : AssetStoreToolsWindow
+    {
+        protected override string WindowTitle => "Preview Generator";
+
+        private ICachingService _cachingService;
+
+        private PreviewListView _previewListView;
+
+        protected override void Init()
+        {
+            minSize = new Vector2(350, 350);
+
+            this.SetAntiAliasing(4);
+
+            VisualElement root = rootVisualElement;
+
+            // Getting a reference to the USS Document and adding stylesheet to the root
+            root.styleSheets.Add(StyleSelector.PreviewGeneratorWindow.PreviewGeneratorWindowStyle);
+            root.styleSheets.Add(StyleSelector.PreviewGeneratorWindow.PreviewGeneratorWindowTheme);
+
+            GetServices();
+            ConstructWindow();
+        }
+
+        private void GetServices()
+        {
+            _cachingService = PreviewServiceProvider.Instance.GetService<ICachingService>();
+        }
+
+        private void ConstructWindow()
+        {
+            _previewListView = new PreviewListView(_cachingService);
+            rootVisualElement.Add(_previewListView);
+        }
+
+        public void Load(PreviewGenerationSettings settings)
+        {
+            _previewListView.LoadSettings(settings);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/PreviewGeneratorWindow.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/PreviewGeneratorWindow.cs.meta
new file mode 100644
index 0000000..04e4202
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/PreviewGeneratorWindow.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 4cad15de2de8cdc46b48a4b05eac5d78
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/PreviewGeneratorWindow.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Views.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Views.meta
new file mode 100644
index 0000000..598279e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Views.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5e154861b0e2af64b93f6c831e6c0dc2
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Views/PreviewListView.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Views/PreviewListView.cs
new file mode 100644
index 0000000..53da896
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Views/PreviewListView.cs
@@ -0,0 +1,142 @@
+using AssetStoreTools.Previews.Data;
+using AssetStoreTools.Previews.Services;
+using AssetStoreTools.Previews.UI.Data;
+using AssetStoreTools.Previews.UI.Elements;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Previews.UI.Views
+{
+    internal class PreviewListView : VisualElement
+    {
+        //Data
+        private PreviewDatabase _previewDatabase;
+        private IPreviewGeneratorSettings _previewGeneratorSettings;
+        private IAssetPreviewCollection _previewCollection;
+
+        private ICachingService _cachingService;
+
+        // UI
+        private PreviewWindowDescriptionElement _descriptionElement;
+        private PreviewGeneratorSettingsElement _settingsElement;
+        private PreviewGenerateButtonElement _generateButtonElement;
+        private PreviewCollectionElement _previewCollectionElement;
+
+        public PreviewListView(ICachingService cachingService)
+        {
+            _cachingService = cachingService;
+
+            _previewGeneratorSettings = new PreviewGeneratorSettings();
+            _previewCollection = new AssetPreviewCollection();
+
+            _previewGeneratorSettings.OnGenerationTypeChanged += RefreshPreviewList;
+            _previewGeneratorSettings.OnGenerationPathsChanged += RefreshPreviewList;
+
+            Create();
+            RefreshPreviewList();
+        }
+
+        private void Create()
+        {
+            CreateDescription();
+            CreateSettings();
+            CreateGenerateButton();
+            CreatePreviewList();
+        }
+
+        private void CreateDescription()
+        {
+            _descriptionElement = new PreviewWindowDescriptionElement();
+            Add(_descriptionElement);
+        }
+
+        private void CreateSettings()
+        {
+            _settingsElement = new PreviewGeneratorSettingsElement(_previewGeneratorSettings);
+            Add(_settingsElement);
+        }
+
+        private void CreateGenerateButton()
+        {
+            _generateButtonElement = new PreviewGenerateButtonElement(_previewGeneratorSettings);
+            _generateButtonElement.OnGenerate += GeneratePreviews;
+            Add(_generateButtonElement);
+        }
+
+        private void CreatePreviewList()
+        {
+            _previewCollectionElement = new PreviewCollectionElement(_previewCollection);
+            Add(_previewCollectionElement);
+        }
+
+        private async void GeneratePreviews()
+        {
+            try
+            {
+                _settingsElement.SetEnabled(false);
+                _generateButtonElement.SetEnabled(false);
+                _previewCollectionElement.SetEnabled(false);
+
+                var generator = _previewGeneratorSettings.CreateGenerator();
+                generator.OnProgressChanged += DisplayProgress;
+                var result = await generator.Generate();
+                generator.OnProgressChanged -= DisplayProgress;
+
+                if (!result.Success)
+                {
+                    EditorUtility.DisplayDialog("Error", result.Exception.Message, "OK");
+                    Debug.LogException(result.Exception);
+                    return;
+                }
+
+                RefreshPreviewList();
+            }
+            finally
+            {
+                _settingsElement.SetEnabled(true);
+                _generateButtonElement.SetEnabled(true);
+                _previewCollectionElement.SetEnabled(true);
+                EditorUtility.ClearProgressBar();
+            }
+        }
+
+        private void DisplayProgress(float progress)
+        {
+            EditorUtility.DisplayProgressBar("Generating", "Generating previews...", progress);
+        }
+
+        public void LoadSettings(PreviewGenerationSettings settings)
+        {
+            _previewGeneratorSettings.LoadSettings(settings);
+        }
+
+        private void RefreshPreviewList()
+        {
+            if (!_cachingService.GetCachedMetadata(out _previewDatabase))
+                _previewDatabase = new PreviewDatabase();
+
+            var paths = _previewGeneratorSettings.GetGenerationPaths();
+            var guids = AssetDatabase.FindAssets("", paths.ToArray());
+            var displayedPreviews = new List<PreviewMetadata>();
+
+            foreach (var entry in _previewDatabase.Previews)
+            {
+                if (!entry.Exists())
+                    continue;
+
+                if (entry.Type != _previewGeneratorSettings.GetGenerationType())
+                    continue;
+
+                if (!guids.Any(x => x == entry.Guid))
+                    continue;
+
+                displayedPreviews.Add(entry);
+            }
+
+            _previewCollection.Refresh(_previewGeneratorSettings.GetGenerationType(), displayedPreviews);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Views/PreviewListView.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Views/PreviewListView.cs.meta
new file mode 100644
index 0000000..5c2a716
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Views/PreviewListView.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 94d417240bb510d469acb8a11f15b277
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/UI/Views/PreviewListView.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility.meta
new file mode 100644
index 0000000..92fdd4f
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 99cf24252c136f246bfa4b02a69fe992
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/GraphicsUtility.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/GraphicsUtility.cs
new file mode 100644
index 0000000..af16367
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/GraphicsUtility.cs
@@ -0,0 +1,96 @@
+using UnityEngine;
+
+namespace AssetStoreTools.Previews.Utility
+{
+    internal static class GraphicsUtility
+    {
+        public static Texture2D GetTextureFromCamera(Camera camera, int desiredWidth, int desiredHeight, int desiredDepth)
+        {
+            var texture = new Texture2D(desiredWidth, desiredHeight);
+            var originalRenderTexture = RenderTexture.active;
+            var renderTexture = RenderTexture.GetTemporary(desiredWidth, desiredHeight, desiredDepth);
+            var cameraInitiallyEnabled = camera.enabled;
+
+            try
+            {
+                if (cameraInitiallyEnabled)
+                    camera.enabled = false;
+
+                camera.targetTexture = renderTexture;
+                camera.Render();
+
+                RenderTexture.active = renderTexture;
+                texture.ReadPixels(new Rect(0, 0, texture.width, texture.height), 0, 0);
+                texture.Apply();
+            }
+            finally
+            {
+                camera.targetTexture = null;
+                RenderTexture.active = originalRenderTexture;
+                RenderTexture.ReleaseTemporary(renderTexture);
+                camera.enabled = cameraInitiallyEnabled;
+            }
+
+            return texture;
+        }
+
+        public static Texture2D ResizeTexture(Texture2D source, int desiredWidth, int desiredHeight)
+        {
+            var texture = new Texture2D(desiredWidth, desiredHeight);
+            var originalRenderTexture = RenderTexture.active;
+            var renderTexture = RenderTexture.GetTemporary(desiredWidth, desiredHeight, 32);
+
+            try
+            {
+                RenderTexture.active = renderTexture;
+                Graphics.Blit(source, renderTexture);
+
+                texture.ReadPixels(new Rect(0, 0, renderTexture.width, renderTexture.height), 0, 0);
+                texture.Apply();
+            }
+            finally
+            {
+                RenderTexture.active = originalRenderTexture;
+                RenderTexture.ReleaseTemporary(renderTexture);
+            }
+
+            return texture;
+        }
+
+        public static Texture2D ResizeTextureNormalMap(Texture2D source, int desiredWidth, int desiredHeight)
+        {
+            var texture = new Texture2D(desiredWidth, desiredHeight);
+            var originalRenderTexture = RenderTexture.active;
+            var renderTexture = RenderTexture.GetTemporary(desiredWidth, desiredHeight, 32, RenderTextureFormat.Default, RenderTextureReadWrite.Linear);
+
+            try
+            {
+                RenderTexture.active = renderTexture;
+                Graphics.Blit(source, renderTexture);
+
+                texture.ReadPixels(new Rect(0, 0, renderTexture.width, renderTexture.height), 0, 0);
+
+                for (int i = 0; i < texture.width; i++)
+                {
+                    for (int j = 0; j < texture.height; j++)
+                    {
+                        var color = texture.GetPixel(i, j);
+                        color.b = color.r;
+                        color.r = color.a;
+                        color.a = 1;
+                        texture.SetPixel(i, j, color);
+                    }
+                }
+
+                texture.Apply();
+            }
+            finally
+            {
+                RenderTexture.active = originalRenderTexture;
+                RenderTexture.ReleaseTemporary(renderTexture);
+            }
+
+            return texture;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/GraphicsUtility.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/GraphicsUtility.cs.meta
new file mode 100644
index 0000000..9acc1c2
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/GraphicsUtility.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: f0a4fc8f266b4dd41a59693dd581e232
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/GraphicsUtility.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/PreviewConvertUtility.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/PreviewConvertUtility.cs
new file mode 100644
index 0000000..81c5a40
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/PreviewConvertUtility.cs
@@ -0,0 +1,72 @@
+using AssetStoreTools.Previews.Data;
+using UnityEditor;
+using UnityEngine;
+
+namespace AssetStoreTools.Previews.Utility
+{
+    internal static class PreviewConvertUtility
+    {
+        public static string ConvertFilename(Object asset, FileNameFormat format)
+        {
+            string fileName = string.Empty;
+
+            switch (format)
+            {
+                case FileNameFormat.Guid:
+                    AssetDatabase.TryGetGUIDAndLocalFileIdentifier(asset, out var guid, out long _);
+                    fileName = guid;
+                    break;
+                case FileNameFormat.FullAssetPath:
+                    var assetPath = AssetDatabase.GetAssetPath(asset);
+
+                    if (assetPath.StartsWith("Assets/"))
+                        fileName = assetPath.Substring("Assets/".Length);
+                    else if (assetPath.StartsWith("Packages/"))
+                        fileName = assetPath.Substring("Packages/".Length);
+
+                    fileName = fileName.Replace("/", "_");
+                    break;
+                case FileNameFormat.AssetName:
+                    fileName = asset.name;
+                    break;
+                default:
+                    throw new System.Exception("Undefined format");
+            }
+
+            return fileName;
+        }
+
+        public static string ConvertExtension(PreviewFormat format)
+        {
+            switch (format)
+            {
+                case PreviewFormat.JPG:
+                    return "jpg";
+                case PreviewFormat.PNG:
+                    return "png";
+                default:
+                    throw new System.Exception("Undefined format");
+            }
+        }
+
+        public static string ConvertFilenameWithExtension(Object asset, FileNameFormat nameFormat, PreviewFormat imageFormat)
+        {
+            var filename = ConvertFilename(asset, nameFormat);
+            var extension = ConvertExtension(imageFormat);
+            return $"{filename}.{extension}";
+        }
+
+        public static byte[] ConvertTexture(Texture2D texture, PreviewFormat format)
+        {
+            switch (format)
+            {
+                case PreviewFormat.JPG:
+                    return texture.EncodeToJPG();
+                case PreviewFormat.PNG:
+                    return texture.EncodeToPNG();
+                default:
+                    throw new System.Exception("Undefined format");
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/PreviewConvertUtility.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/PreviewConvertUtility.cs.meta
new file mode 100644
index 0000000..e9b337d
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/PreviewConvertUtility.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 700eaf82299628d44853599774664bea
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/PreviewConvertUtility.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/PreviewSceneUtility.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/PreviewSceneUtility.cs
new file mode 100644
index 0000000..ff4d79d
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/PreviewSceneUtility.cs
@@ -0,0 +1,196 @@
+using System;
+using System.Threading.Tasks;
+using UnityEditor;
+using UnityEditor.SceneManagement;
+using UnityEngine;
+#if AST_URP_AVAILABLE
+using UnityEngine.Rendering.Universal;
+#endif
+#if AST_HDRP_AVAILABLE
+using UnityEngine.Rendering;
+using UnityEngine.Rendering.HighDefinition;
+#endif
+
+namespace AssetStoreTools.Previews.Utility
+{
+    internal static class PreviewSceneUtility
+    {
+        private const string PreviewSceneName = "Preview Generation In Progress";
+        private static readonly Color BackgroundColor = new Color(82f / 255, 82f / 255, 82f / 255);
+        private static readonly Color BackgroundColorHDRP = new Color(38f / 255, 38f / 255, 38f / 255);
+
+        public static async Task OpenPreviewSceneForCurrentPipeline()
+        {
+            // Wait for an Editor frame to avoid recursive player loop internal errors
+            await WaitForEditorUpdate();
+
+            switch (RenderPipelineUtility.GetCurrentPipeline())
+            {
+                case RenderPipeline.BiRP:
+                    await OpenPreviewSceneBiRP();
+                    break;
+#if AST_URP_AVAILABLE
+                case RenderPipeline.URP:
+                    await OpenPreviewSceneURP();
+                    break;
+#endif
+#if AST_HDRP_AVAILABLE
+                case RenderPipeline.HDRP:
+                    await OpenPreviewSceneHDRP();
+                    break;
+#endif
+                default:
+                    throw new NotImplementedException("Undefined Render Pipeline");
+            }
+        }
+
+        private static async Task WaitForEditorUpdate()
+        {
+            var updateCalled = false;
+            var delayCalled = false;
+
+            void Update()
+            {
+                EditorApplication.update -= Update;
+                updateCalled = true;
+            }
+
+            EditorApplication.update += Update;
+            while (!updateCalled)
+                await Task.Delay(10);
+
+            void DelayCall()
+            {
+                EditorApplication.delayCall -= DelayCall;
+                delayCalled = true;
+            }
+
+            EditorApplication.delayCall += DelayCall;
+            while (!delayCalled)
+                await Task.Delay(10);
+        }
+
+        public static async Task OpenPreviewSceneBiRP()
+        {
+            OpenNewScene();
+
+            CreateSceneCamera();
+            CreateSceneLighting();
+
+            await WaitForLighting();
+        }
+
+        private static void OpenNewScene()
+        {
+            EditorSceneManager.SaveCurrentModifiedScenesIfUserWantsTo();
+            var scene = EditorSceneManager.NewScene(NewSceneSetup.EmptyScene, NewSceneMode.Single);
+            scene.name = PreviewSceneName;
+        }
+
+        private static Camera CreateSceneCamera()
+        {
+            var cameraGO = new GameObject() { name = "Camera" };
+            var camera = cameraGO.AddComponent<Camera>();
+            camera.enabled = false;
+            camera.tag = "MainCamera";
+
+            camera.nearClipPlane = 0.01f;
+            camera.farClipPlane = 100000;
+            camera.clearFlags = CameraClearFlags.SolidColor;
+            camera.backgroundColor = BackgroundColor;
+
+            return camera;
+        }
+
+        private static Light CreateSceneLighting()
+        {
+            var lightGO = new GameObject() { name = "Lights" };
+            lightGO.transform.rotation = Quaternion.Euler(45, 225, 0);
+            var light = lightGO.AddComponent<Light>();
+            light.intensity = 0.75f;
+            light.type = LightType.Directional;
+            light.shadows = LightShadows.None;
+
+            return light;
+        }
+
+        private static async Task WaitForLighting()
+        {
+            while (!DynamicGI.isConverged)
+                await Task.Delay(100);
+
+            await Task.Yield();
+        }
+
+#if AST_URP_AVAILABLE
+        public static async Task OpenPreviewSceneURP()
+        {
+            OpenNewScene();
+
+            var camera = CreateSceneCamera();
+            camera.gameObject.AddComponent<UniversalAdditionalCameraData>();
+
+            var lighting = CreateSceneLighting();
+            lighting.intensity = 0.5f;
+            lighting.gameObject.AddComponent<UniversalAdditionalLightData>();
+
+            await WaitForLighting();
+        }
+#endif
+
+#if AST_HDRP_AVAILABLE
+        public static async Task OpenPreviewSceneHDRP()
+        {
+            OpenNewScene();
+
+            var camera = CreateSceneCamera();
+            var cameraData = camera.gameObject.AddComponent<HDAdditionalCameraData>();
+            cameraData.clearColorMode = HDAdditionalCameraData.ClearColorMode.Color;
+            cameraData.backgroundColorHDR = BackgroundColorHDRP;
+
+            var light = CreateSceneLighting();
+            var lightData = light.gameObject.AddComponent<HDAdditionalLightData>();
+            lightData.SetIntensity(5000, LightUnit.Lux);
+
+            CreateHDRPVolumeProfile();
+
+            await WaitForLighting();
+        }
+
+        private static Volume CreateHDRPVolumeProfile()
+        {
+            var volumeGO = new GameObject() { name = "Volume" };
+            var volume = volumeGO.gameObject.AddComponent<Volume>();
+
+            var profile = VolumeProfile.CreateInstance<VolumeProfile>();
+            volume.profile = profile;
+            volume.isGlobal = true;
+
+            var exposure = profile.Add<Exposure>();
+            exposure.active = true;
+
+            exposure.mode.overrideState = true;
+            exposure.mode.value = ExposureMode.Fixed;
+
+            exposure.fixedExposure.overrideState = true;
+            exposure.fixedExposure.value = 11;
+
+            var fog = profile.Add<Fog>();
+            fog.active = true;
+
+            fog.enabled.overrideState = true;
+            fog.enabled.value = false;
+
+#if AST_HDRP_AVAILABLE_V12
+            var volumetricClouds = profile.Add<VolumetricClouds>();
+            volumetricClouds.active = true;
+
+            volumetricClouds.enable.overrideState = true;
+            volumetricClouds.enable.value = false;
+#endif
+
+            return volume;
+        }
+#endif
+        }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/PreviewSceneUtility.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/PreviewSceneUtility.cs.meta
new file mode 100644
index 0000000..c11d3fb
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/PreviewSceneUtility.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 63fa5650920e7914dae6fe76badac249
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/PreviewSceneUtility.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/RenderPipeline.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/RenderPipeline.cs
new file mode 100644
index 0000000..597539a
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/RenderPipeline.cs
@@ -0,0 +1,10 @@
+namespace AssetStoreTools.Previews.Utility
+{
+    internal enum RenderPipeline
+    {
+        Unknown = 0,
+        BiRP = 1,
+        URP = 2,
+        HDRP = 3
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/RenderPipeline.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/RenderPipeline.cs.meta
new file mode 100644
index 0000000..cbc5929
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/RenderPipeline.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: c43c7ce2b9090ab49bb8944bc6bdb3c7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/RenderPipeline.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/RenderPipelineUtility.cs b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/RenderPipelineUtility.cs
new file mode 100644
index 0000000..e93bd1d
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/RenderPipelineUtility.cs
@@ -0,0 +1,32 @@
+using UnityEngine.Rendering;
+#if AST_URP_AVAILABLE
+using UnityEngine.Rendering.Universal;
+#endif
+#if AST_HDRP_AVAILABLE
+using UnityEngine.Rendering.HighDefinition;
+#endif
+
+namespace AssetStoreTools.Previews.Utility
+{
+    internal static class RenderPipelineUtility
+    {
+        public static RenderPipeline GetCurrentPipeline()
+        {
+            var currentPipelineAsset = GraphicsSettings.currentRenderPipeline;
+            if (currentPipelineAsset == null)
+                return RenderPipeline.BiRP;
+
+#if AST_URP_AVAILABLE
+            if (currentPipelineAsset is UniversalRenderPipelineAsset)
+                return RenderPipeline.URP;
+#endif
+
+#if AST_HDRP_AVAILABLE
+            if (currentPipelineAsset is HDRenderPipelineAsset)
+                return RenderPipeline.HDRP;
+#endif
+
+            return RenderPipeline.Unknown;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/RenderPipelineUtility.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/RenderPipelineUtility.cs.meta
new file mode 100644
index 0000000..96956b5
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/RenderPipelineUtility.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 5e42bdf53cd8b51429b10a6742ec5272
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Scripts/Utility/RenderPipelineUtility.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Styles.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Styles.meta
new file mode 100644
index 0000000..50a0018
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Styles.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 70d30555bce30014a9143c3d003105bf
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Styles/Style.uss b/Packages/com.unity.asset-store-tools/Editor/Previews/Styles/Style.uss
new file mode 100644
index 0000000..833f506
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Styles/Style.uss
@@ -0,0 +1,210 @@
+/* Asset Preview Description */
+
+.asset-preview-description {
+	flex-direction: column;
+    flex-shrink: 0;
+
+    margin: 10px 5px 2px 5px;
+    padding: 2px 4px;
+}
+
+.asset-preview-description-simple-container {
+	flex-direction: column;
+    flex-wrap: wrap;
+}
+
+.asset-preview-description-simple-label {
+	white-space: normal;
+}
+
+.asset-preview-description-hyperlink-button {
+	margin: 0;
+    padding: 0;
+    
+    align-self: flex-start;
+    cursor: link;
+}
+
+.asset-preview-description-show-button {
+	margin-top: 12px;
+}
+
+.asset-preview-description-hide-button {
+	margin-top: 12px;
+}
+
+.asset-preview-description-full-container {
+	margin-top: 12px;
+}
+
+.asset-preview-description-full-label {
+	white-space: normal;
+}
+
+/* Asset Preview Settings */
+
+.preview-settings {
+    flex-direction: column;
+    flex-shrink: 0;
+
+    margin: 0px 5px 2px 5px;
+    padding: 2px 4px;
+}
+
+.preview-settings-selection-row {
+    flex-direction: row;
+    flex-grow: 1;
+    
+    margin-top: 10px;
+    padding: 0 3px 0 2px;
+}
+
+.preview-settings-selection-label-help-row {
+    flex-direction: row;
+    flex-shrink: 1;
+    flex-grow: 0;
+
+    align-self: center;
+    align-items: center;
+    justify-content: flex-start;
+
+    width: 120px;
+}
+
+.preview-settings-selection-label-help-row > Label {
+    -unity-font-style: bold;
+}
+
+.preview-settings-selection-label-help-row > Image {
+    height: 16px;
+    width: 16px;
+}
+
+.preview-settings-selection-dropdown {
+    flex-grow: 1;
+    flex-shrink: 1;
+
+    align-self: stretch;
+
+    margin-right: 0;
+    margin-left: 3px;
+    padding: 1px 4px;
+}
+
+/* Preview Paths */
+
+.preview-paths {
+    flex-direction: column;
+    flex-grow: 1;
+    flex-shrink: 0;
+    
+    margin-bottom: 10px;
+    padding: 0;
+}
+
+.preview-paths-box {
+    flex-grow: 1;
+    flex-direction: column;
+}
+
+.preview-paths-scroll-view {
+    flex-grow: 1;
+    height: 100px;
+    margin-left: 3px;
+}
+
+.preview-paths-scroll-view > .unity-scroll-view__content-viewport
+{
+    margin-left: 1px;
+}
+
+.preview-paths-scroll-view > * > .unity-scroll-view__content-container
+{
+    padding: 0 0 0 0;
+}
+
+.preview-paths-scroll-view > * > .unity-scroll-view__vertical-scroller
+{
+    margin: -1px 0;
+}
+
+.preview-paths-scroll-view-bottom-row {
+    flex-direction: row-reverse;
+    margin: -1px 0 0 3px;
+}
+
+.preview-paths-add-button {
+    margin: 3px 0 0 0;
+    align-self: center;
+}
+
+.preview-paths-path-row {
+    flex-direction: row;
+    flex-grow: 1;
+
+    margin-top: 2px;
+    padding: 0 5px 0 2px;
+}
+
+.preview-paths-path-row-input-field {
+    flex-grow: 1;
+    flex-shrink: 1;
+
+    padding-left: 5px;
+
+    white-space: normal;
+    -unity-text-align: middle-left;
+}
+
+.preview-paths-path-row-remove-button {
+    width: 20px;
+    height: 20px;
+    margin-left: 2px;
+    margin-right: 1px;
+    padding: 1px 0 0 0;
+}
+
+/* Generate Button */
+
+.preview-generate-button {
+    align-self: stretch;
+    
+    height: 25px;
+    margin-left: 2px;
+}
+
+/* Asset Preview List Element */
+
+.preview-list {
+	margin-top: 10px;
+    flex-grow: 1;
+}
+
+.preview-list-image {
+    width: 140px;
+    height: 160px;
+    margin: 5px;
+    padding: 5px;
+    justify-content: space-between;
+}
+
+.preview-list-image:hover{
+    background-color: #444444;
+}
+
+.preview-list-image > Image {
+    flex-shrink: 0;
+    max-width: 100%;
+    max-height: 100%;
+    -unity-background-scale-mode: scale-to-fit;
+    align-self: center;
+}
+
+.preview-list-image > Label {
+    align-self: center;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    margin-top: 2px;
+    padding: 0;
+    -unity-text-align: middle-center;
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Styles/Style.uss.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Styles/Style.uss.meta
new file mode 100644
index 0000000..14dfd5d
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Styles/Style.uss.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 095b74bd60b187c418dcc4cd47aa696d
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Styles/Style.uss
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Styles/ThemeDark.uss b/Packages/com.unity.asset-store-tools/Editor/Previews/Styles/ThemeDark.uss
new file mode 100644
index 0000000..d4244f4
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Styles/ThemeDark.uss
@@ -0,0 +1,67 @@
+.primary-colors {
+    /* Light - lighter */
+    background-color: rgb(220, 220, 220);
+    /* Light - middle */
+    background-color: rgb(200, 200, 200);
+    /* Light - darker */
+    background-color: rgb(180, 180, 180);
+
+    /* Dark - lighter */
+    background-color: rgb(78, 78, 78);
+    /* Dark - middle */
+    background-color: rgb(68, 68, 68);
+    /* Dark - darker */
+    background-color: rgb(58, 58, 58);
+
+    /* Border color - light */
+    border-color: rgb(200, 200, 200);
+    /* Border color - dark */
+    border-color: rgb(33, 33, 33);
+}
+
+/* Asset Preview Description */
+
+.asset-preview-description-hyperlink-button {
+    color: rgb(68, 113, 229);
+    border-width: 0;
+    background-color: rgba(0, 0, 0, 0);
+}
+
+.asset-preview-description-hyperlink-button:hover {
+    color: rgb(68, 133, 229);
+}
+
+.asset-preview-description-hyperlink-button:active {
+    color: rgb(68, 93, 229);
+}
+
+/* Asset Preview Settings */
+
+.preview-settings-selection-label-help-row > Image {
+    --unity-image: resource("d__Help@2x");
+}
+
+.preview-settings-selection-dropdown {
+    color: rgb(238, 238, 238);
+    background-color: rgb(88, 88, 88);
+
+    border-width: 1px;
+    border-radius: 3px;
+    border-color: rgb(36, 36, 36);
+}
+
+/* Preview Paths */
+
+.preview-paths-scroll-view {
+    border-width: 1px;
+    border-color: rgb(33, 33, 33);
+    background-color: rgb(58, 58, 58);
+}
+
+.preview-paths-scroll-view > * > .unity-scroll-view__vertical-scroller {
+    border-right-width: 0;
+}
+
+.preview-paths-path-row-input-field:hover {
+    background-color: rgb(78, 78, 78);
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Styles/ThemeDark.uss.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Styles/ThemeDark.uss.meta
new file mode 100644
index 0000000..8295d42
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Styles/ThemeDark.uss.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 1c04ee69303d45644bb3971a4e8ce952
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Styles/ThemeDark.uss
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Styles/ThemeLight.uss b/Packages/com.unity.asset-store-tools/Editor/Previews/Styles/ThemeLight.uss
new file mode 100644
index 0000000..0c25703
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Styles/ThemeLight.uss
@@ -0,0 +1,67 @@
+.primary-colors {
+    /* Light - lighter */
+    background-color: rgb(220, 220, 220);
+    /* Light - middle */
+    background-color: rgb(200, 200, 200);
+    /* Light - darker */
+    background-color: rgb(180, 180, 180);
+
+    /* Dark - lighter */
+    background-color: rgb(50, 50, 50);
+    /* Dark - middle */
+    background-color: rgb(28, 28, 28);
+    /* Dark - darker */
+    background-color: rgb(0, 0, 0);
+
+    /* Border color - light */
+    border-color: rgb(200, 200, 200);
+    /* Border color - dark */
+    border-color: rgb(33, 33, 33);
+}
+
+/* Asset Preview Description */
+
+.asset-preview-description-hyperlink-button {
+    color: rgb(68, 113, 229);
+    border-width: 0;
+    background-color: rgba(0, 0, 0, 0);
+}
+
+.asset-preview-description-hyperlink-button:hover {
+    color: rgb(68, 133, 229);
+}
+
+.asset-preview-description-hyperlink-button:active {
+    color: rgb(68, 93, 229);
+}
+
+/* Asset Preview Settings */
+
+.preview-settings-selection-label-help-row > Image {
+    --unity-image: resource("_Help@2x");
+}
+
+.preview-settings-selection-dropdown {
+    color: rgb(9, 9, 9);
+    background-color: rgb(228, 228, 228);
+
+    border-width: 1px;
+    border-radius: 3px;
+    border-color: rgb(178, 178, 178);
+}
+
+/* Preview Paths */
+
+.preview-paths-scroll-view {
+    border-width: 1px;
+    border-color: rgb(33, 33, 33);
+    background-color: rgb(180, 180, 180);
+}
+
+.preview-paths-scroll-view > * > .unity-scroll-view__vertical-scroller {
+    border-right-width: 0;
+}
+
+.preview-paths-path-row-input-field:hover {
+    background-color: rgb(200, 200, 200);
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Previews/Styles/ThemeLight.uss.meta b/Packages/com.unity.asset-store-tools/Editor/Previews/Styles/ThemeLight.uss.meta
new file mode 100644
index 0000000..f522d08
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Previews/Styles/ThemeLight.uss.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 38ae9e6ef965cae43902ba22967938ee
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Previews/Styles/ThemeLight.uss
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Unity.AssetStoreTools.Editor.asmdef b/Packages/com.unity.asset-store-tools/Editor/Unity.AssetStoreTools.Editor.asmdef
new file mode 100644
index 0000000..37db321
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Unity.AssetStoreTools.Editor.asmdef
@@ -0,0 +1,36 @@
+{
+    "name": "asset-store-tools-editor",
+    "rootNamespace": "",
+    "references": [
+        "Unity.RenderPipelines.Universal.Runtime",
+        "Unity.RenderPipelines.Core.Runtime",
+        "Unity.RenderPipelines.HighDefinition.Runtime"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [
+        {
+            "name": "com.unity.render-pipelines.universal",
+            "expression": "1.0.0",
+            "define": "AST_URP_AVAILABLE"
+        },
+        {
+            "name": "com.unity.render-pipelines.high-definition",
+            "expression": "1.0.0",
+            "define": "AST_HDRP_AVAILABLE"
+        },
+        {
+            "name": "com.unity.render-pipelines.high-definition",
+            "expression": "12.0.0",
+            "define": "AST_HDRP_AVAILABLE_V12"
+        }
+    ],
+    "noEngineReferences": false
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Unity.AssetStoreTools.Editor.asmdef.meta b/Packages/com.unity.asset-store-tools/Editor/Unity.AssetStoreTools.Editor.asmdef.meta
new file mode 100644
index 0000000..5e13508
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Unity.AssetStoreTools.Editor.asmdef.meta
@@ -0,0 +1,14 @@
+fileFormatVersion: 2
+guid: c183be512f4485d40a3437fabd6c81cf
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Unity.AssetStoreTools.Editor.asmdef
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader.meta
new file mode 100644
index 0000000..b4b8661
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9722d52df16aab742b26fe301782c74c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons.meta
new file mode 100644
index 0000000..7026063
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ab9d0e254817f4f4589a6a378d77babc
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/account-dark.png b/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/account-dark.png
new file mode 100644
index 0000000..f54f1a2
Binary files /dev/null and b/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/account-dark.png differ
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/account-dark.png.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/account-dark.png.meta
new file mode 100644
index 0000000..f4bf516
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/account-dark.png.meta
@@ -0,0 +1,130 @@
+fileFormatVersion: 2
+guid: 92f8a779a7c786a4f87ed8e1b36a66b3
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/account-dark.png
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/account-light.png b/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/account-light.png
new file mode 100644
index 0000000..d6684e5
Binary files /dev/null and b/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/account-light.png differ
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/account-light.png.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/account-light.png.meta
new file mode 100644
index 0000000..769b5ba
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/account-light.png.meta
@@ -0,0 +1,130 @@
+fileFormatVersion: 2
+guid: 7c0661b9a6385a3488c075711f368cf4
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/account-light.png
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/open-in-browser.png b/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/open-in-browser.png
new file mode 100644
index 0000000..245875b
Binary files /dev/null and b/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/open-in-browser.png differ
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/open-in-browser.png.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/open-in-browser.png.meta
new file mode 100644
index 0000000..d0b3e91
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/open-in-browser.png.meta
@@ -0,0 +1,154 @@
+fileFormatVersion: 2
+guid: e7df43612bbf44d4692de879c751902a
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 2
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/open-in-browser.png
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/publisher-portal-dark.png b/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/publisher-portal-dark.png
new file mode 100644
index 0000000..70f4703
Binary files /dev/null and b/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/publisher-portal-dark.png differ
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/publisher-portal-dark.png.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/publisher-portal-dark.png.meta
new file mode 100644
index 0000000..7676a31
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/publisher-portal-dark.png.meta
@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 003e2710f9b29d94c87632022a3c7c48
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 18
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/publisher-portal-dark.png
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/publisher-portal-light.png b/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/publisher-portal-light.png
new file mode 100644
index 0000000..621e906
Binary files /dev/null and b/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/publisher-portal-light.png differ
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/publisher-portal-light.png.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/publisher-portal-light.png.meta
new file mode 100644
index 0000000..7162554
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/publisher-portal-light.png.meta
@@ -0,0 +1,142 @@
+fileFormatVersion: 2
+guid: 8e0749dce5b14cc46b73b0303375c162
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 1
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Icons/publisher-portal-light.png
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts.meta
new file mode 100644
index 0000000..63c6efc
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 15b24ad8f9d236249910fb8eef1e30ea
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data.meta
new file mode 100644
index 0000000..1382bf8
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 930cfc857321b1048bf9607d4c8f89d3
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions.meta
new file mode 100644
index 0000000..73728d0
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 771776e4d51c47945b3449d4de948c00
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IPackage.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IPackage.cs
new file mode 100644
index 0000000..05a1bf6
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IPackage.cs
@@ -0,0 +1,34 @@
+using System;
+using UnityEngine;
+using PackageModel = AssetStoreTools.Api.Models.Package;
+
+namespace AssetStoreTools.Uploader.Data
+{
+    internal interface IPackage
+    {
+        string PackageId { get; }
+        string VersionId { get; }
+        string Name { get; }
+        string Status { get; }
+        string Category { get; }
+        bool IsCompleteProject { get; }
+        string RootGuid { get; }
+        string RootPath { get; }
+        string ProjectPath { get; }
+        string Modified { get; }
+        string Size { get; }
+        bool IsDraft { get; }
+        Texture2D Icon { get; }
+
+        event Action OnUpdate;
+        event Action OnIconUpdate;
+
+        string FormattedSize();
+        string FormattedModified();
+
+        void UpdateData(PackageModel source);
+        void UpdateIcon(Texture2D texture);
+
+        PackageModel ToModel();
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IPackage.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IPackage.cs.meta
new file mode 100644
index 0000000..190b689
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IPackage.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: b92f2ed98d0b31a479aa2bfd95528fbd
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IPackage.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IPackageContent.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IPackageContent.cs
new file mode 100644
index 0000000..47171dd
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IPackageContent.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+
+namespace AssetStoreTools.Uploader.Data
+{
+    internal interface IPackageContent
+    {
+        event Action<IWorkflow> OnActiveWorkflowChanged;
+
+        IWorkflow GetActiveWorkflow();
+        List<IWorkflow> GetAvailableWorkflows();
+        void SetActiveWorkflow(IWorkflow workflow);
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IPackageContent.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IPackageContent.cs.meta
new file mode 100644
index 0000000..6142045
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IPackageContent.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 45ce41158c3174149b7056a30ac901db
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IPackageContent.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IPackageGroup.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IPackageGroup.cs
new file mode 100644
index 0000000..fb60516
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IPackageGroup.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+
+namespace AssetStoreTools.Uploader.Data
+{
+    internal interface IPackageGroup
+    {
+        string Name { get; }
+        List<IPackage> Packages { get; }
+
+        event Action<List<IPackage>> OnPackagesSorted;
+        event Action<List<IPackage>> OnPackagesFiltered;
+
+        void Sort(PackageSorting sortingType);
+        void Filter(string filter);
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IPackageGroup.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IPackageGroup.cs.meta
new file mode 100644
index 0000000..4a35808
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IPackageGroup.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: f683845071b8891498156d95a1a5c2dd
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IPackageGroup.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IWorkflow.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IWorkflow.cs
new file mode 100644
index 0000000..64ea838
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IWorkflow.cs
@@ -0,0 +1,36 @@
+using AssetStoreTools.Api;
+using AssetStoreTools.Api.Responses;
+using AssetStoreTools.Exporter;
+using AssetStoreTools.Validator.Data;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace AssetStoreTools.Uploader.Data
+{
+    internal interface IWorkflow
+    {
+        string Name { get; }
+        string DisplayName { get; }
+        string PackageName { get; }
+        string PackageExtension { get; }
+        bool IsPathSet { get; }
+
+        event Action OnChanged;
+        event Action<UploadStatus?, float?> OnUploadStateChanged;
+
+        bool GenerateHighQualityPreviews { get; set; }
+        ValidationSettings LastValidationSettings { get; }
+        ValidationResult LastValidationResult { get; }
+
+        IEnumerable<string> GetAllPaths();
+        ValidationResult Validate();
+        Task<PackageExporterResult> ExportPackage(string outputPath);
+        Task<bool> ValidatePackageUploadedVersions();
+
+        Task<PackageUploadResponse> UploadPackage(string exportedPackagePath);
+        void AbortUpload();
+        void ResetUploadStatus();
+        Task RefreshPackage();
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IWorkflow.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IWorkflow.cs.meta
new file mode 100644
index 0000000..c8381f3
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IWorkflow.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 7a2f796eadafa774bae89cf3939611dd
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IWorkflow.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IWorkflowServices.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IWorkflowServices.cs
new file mode 100644
index 0000000..f5a21de
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IWorkflowServices.cs
@@ -0,0 +1,18 @@
+using AssetStoreTools.Api;
+using AssetStoreTools.Api.Responses;
+using AssetStoreTools.Uploader.Services.Analytics.Data;
+using System;
+using System.Threading.Tasks;
+using UnityEngine.Analytics;
+
+namespace AssetStoreTools.Uploader.Data
+{
+    internal interface IWorkflowServices
+    {
+        Task<PackageUploadedUnityVersionDataResponse> GetPackageUploadedVersions(IPackage package, int timeoutMs);
+        Task<PackageUploadResponse> UploadPackage(IPackageUploader uploader, IProgress<float> progress);
+        void StopUploading(IPackageUploader uploader);
+        AnalyticsResult SendAnalytic(IAssetStoreAnalytic data);
+        Task<RefreshedPackageDataResponse> UpdatePackageData(IPackage package);
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IWorkflowServices.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IWorkflowServices.cs.meta
new file mode 100644
index 0000000..88c381c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IWorkflowServices.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 0ae017363fa41ff4d9926dc4a5852246
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/IWorkflowServices.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/WorkflowBase.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/WorkflowBase.cs
new file mode 100644
index 0000000..fc27383
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/WorkflowBase.cs
@@ -0,0 +1,253 @@
+using AssetStoreTools.Api;
+using AssetStoreTools.Api.Responses;
+using AssetStoreTools.Exporter;
+using AssetStoreTools.Previews;
+using AssetStoreTools.Previews.Data;
+using AssetStoreTools.Previews.Generators;
+using AssetStoreTools.Uploader.Services.Analytics.Data;
+using AssetStoreTools.Utility;
+using AssetStoreTools.Validator;
+using AssetStoreTools.Validator.Data;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using UnityEngine;
+
+namespace AssetStoreTools.Uploader.Data
+{
+    internal abstract class WorkflowBase : IWorkflow
+    {
+        protected IPackage Package;
+
+        public abstract string Name { get; }
+        public abstract string DisplayName { get; }
+        public string PackageName => Package.Name;
+        public abstract string PackageExtension { get; }
+        public abstract bool IsPathSet { get; }
+
+        protected string LocalPackageGuid;
+        protected string LocalPackagePath;
+        protected string LocalProjectPath;
+
+        public bool GenerateHighQualityPreviews { get; set; }
+        public ValidationSettings LastValidationSettings { get; private set; }
+        public ValidationResult LastValidationResult { get; private set; }
+
+        private IWorkflowServices _services;
+        private IPackageUploader _activeUploader;
+
+        public abstract event Action OnChanged;
+        public event Action<UploadStatus?, float?> OnUploadStateChanged;
+
+        public WorkflowBase(IPackage package, IWorkflowServices services)
+        {
+            Package = package;
+            _services = services;
+        }
+
+        public abstract IEnumerable<string> GetAllPaths();
+
+        public abstract IValidator CreateValidator();
+
+        public ValidationResult Validate()
+        {
+            var validator = CreateValidator();
+            var result = CreateValidator().Validate();
+
+            LastValidationSettings = validator.Settings;
+            LastValidationResult = result;
+
+            return result;
+        }
+
+        protected IPreviewGenerator CreatePreviewGenerator(List<string> inputPaths)
+        {
+            PreviewGenerationSettings settings;
+            IPreviewGenerator generator;
+
+            // Filter out ProjectSettings
+            inputPaths = inputPaths.Where(x => x == "Assets" || x.StartsWith("Assets/") || x.StartsWith("Packages/")).ToList();
+
+            if (!GenerateHighQualityPreviews)
+            {
+                settings = new NativePreviewGenerationSettings()
+                {
+                    InputPaths = inputPaths.ToArray(),
+                    OverwriteExisting = false,
+                    OutputPath = Constants.Previews.Native.DefaultOutputPath,
+                    Format = Constants.Previews.Native.DefaultFormat,
+                    PreviewFileNamingFormat = Constants.Previews.DefaultFileNameFormat,
+                    WaitForPreviews = Constants.Previews.Native.DefaultWaitForPreviews,
+                    ChunkedPreviewLoading = Constants.Previews.Native.DefaultChunkedPreviewLoading,
+                    ChunkSize = Constants.Previews.Native.DefaultChunkSize
+                };
+
+                generator = new NativePreviewGenerator((NativePreviewGenerationSettings)settings);
+            }
+            else
+            {
+                settings = new CustomPreviewGenerationSettings()
+                {
+                    InputPaths = inputPaths.ToArray(),
+                    OverwriteExisting = false,
+                    Width = Constants.Previews.Custom.DefaultWidth,
+                    Height = Constants.Previews.Custom.DefaultHeight,
+                    Depth = Constants.Previews.Custom.DefaultDepth,
+                    NativeWidth = Constants.Previews.Custom.DefaultNativeWidth,
+                    NativeHeight = Constants.Previews.Custom.DefaultNativeHeight,
+                    OutputPath = Constants.Previews.Custom.DefaultOutputPath,
+                    Format = Constants.Previews.Custom.DefaultFormat,
+                    PreviewFileNamingFormat = Constants.Previews.DefaultFileNameFormat,
+                    AudioSampleColor = Constants.Previews.Custom.DefaultAudioSampleColor,
+                    AudioBackgroundColor = Constants.Previews.Custom.DefaultAudioBackgroundColor,
+                };
+
+                generator = new CustomPreviewGenerator((CustomPreviewGenerationSettings)settings);
+            }
+
+            return generator;
+        }
+
+        public abstract IPackageExporter CreateExporter(string outputPath);
+
+        public virtual async Task<PackageExporterResult> ExportPackage(string outputPath)
+        {
+            var exporter = CreateExporter(outputPath);
+            var result = await exporter.Export();
+            return result;
+        }
+
+        public async Task<bool> ValidatePackageUploadedVersions()
+        {
+            var unityVersionSupported = string.Compare(Application.unityVersion, Constants.Uploader.MinRequiredUnitySupportVersion, StringComparison.Ordinal) >= 0;
+            if (unityVersionSupported)
+                return true;
+
+            var response = await _services.GetPackageUploadedVersions(Package, 5000);
+            if (response.Cancelled || response.Success == false)
+                return true;
+
+            return response.UnityVersions.Any(x => string.Compare(x, Constants.Uploader.MinRequiredUnitySupportVersion, StringComparison.Ordinal) >= 0);
+        }
+
+        private bool ValidatePackageBeforeUpload(string packagePath, out string error)
+        {
+            error = string.Empty;
+
+            if (!File.Exists(packagePath))
+            {
+                error = $"File '{packagePath}' was not found.";
+                return false;
+            }
+
+            if (!ValidatePackageSize(packagePath, out error))
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        private bool ValidatePackageSize(string packagePath, out string error)
+        {
+            error = string.Empty;
+
+            long packageSize = new FileInfo(packagePath).Length;
+            long packageSizeLimit = Constants.Uploader.MaxPackageSizeBytes;
+
+            if (packageSize <= packageSizeLimit)
+                return true;
+
+            float packageSizeInGB = packageSize / (float)1073741824; // (1024 * 1024 * 1024)
+            float maxPackageSizeInGB = packageSizeLimit / (float)1073741824;
+            error = $"The size of your package ({packageSizeInGB:0.0} GB) exceeds the maximum allowed package size of {maxPackageSizeInGB:0} GB. " +
+                $"Please reduce the size of your package.";
+
+            return false;
+        }
+
+        public async Task<PackageUploadResponse> UploadPackage(string packagePath)
+        {
+            if (!ValidatePackageBeforeUpload(packagePath, out var error))
+            {
+                return new PackageUploadResponse() { Success = false, Status = UploadStatus.Fail, Exception = new Exception(error) };
+            }
+
+            _activeUploader = CreatePackageUploader(packagePath);
+            var progress = new Progress<float>();
+
+            var time = System.Diagnostics.Stopwatch.StartNew();
+
+            progress.ProgressChanged += ReportUploadProgress;
+            var response = await _services.UploadPackage(_activeUploader, progress);
+            progress.ProgressChanged -= ReportUploadProgress;
+
+            // Send analytics
+            time.Stop();
+            if (!response.Cancelled)
+                SendAnalytics(packagePath, response.Status, time.Elapsed.TotalSeconds);
+
+            OnUploadStateChanged?.Invoke(response.Status, null);
+            _activeUploader = null;
+            return response;
+        }
+
+        protected abstract IPackageUploader CreatePackageUploader(string exportedPackagePath);
+
+        private void ReportUploadProgress(object _, float value)
+        {
+            OnUploadStateChanged?.Invoke(null, value);
+        }
+
+        private void SendAnalytics(string packagePath, UploadStatus uploadStatus, double timeTakenSeconds)
+        {
+            try
+            {
+                var analytic = new PackageUploadAnalytic(
+                    packageId: Package.PackageId,
+                    category: Package.Category,
+                    usedValidator: LastValidationResult != null,
+                    validationSettings: LastValidationSettings,
+                    validationResult: LastValidationResult,
+                    uploadFinishedReason: uploadStatus,
+                    timeTaken: timeTakenSeconds,
+                    packageSize: new FileInfo(packagePath).Length,
+                    workflow: Name
+                    );
+
+                var result = _services.SendAnalytic(analytic);
+            }
+            catch (Exception e) { ASDebug.LogError($"Could not send analytics: {e}"); }
+        }
+
+        public void AbortUpload()
+        {
+            if (_activeUploader != null)
+                _services.StopUploading(_activeUploader);
+
+            _activeUploader = null;
+        }
+
+        public void ResetUploadStatus()
+        {
+            OnUploadStateChanged?.Invoke(UploadStatus.Default, 0f);
+        }
+
+        public async Task RefreshPackage()
+        {
+            var response = await _services.UpdatePackageData(Package);
+            if (!response.Success)
+                return;
+
+            Package.UpdateData(response.Package);
+        }
+
+        public abstract bool IsPathValid(string path, out string reason);
+
+        protected abstract void Serialize();
+
+        protected abstract void Deserialize();
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/WorkflowBase.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/WorkflowBase.cs.meta
new file mode 100644
index 0000000..a7a6a65
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/WorkflowBase.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: d0e87ee17aa944c42b1c335abe19daaf
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Abstractions/WorkflowBase.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/AssetsWorkflow.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/AssetsWorkflow.cs
new file mode 100644
index 0000000..010c065
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/AssetsWorkflow.cs
@@ -0,0 +1,329 @@
+using AssetStoreTools.Api;
+using AssetStoreTools.Exporter;
+using AssetStoreTools.Uploader.Data.Serialization;
+using AssetStoreTools.Utility;
+using AssetStoreTools.Validator;
+using AssetStoreTools.Validator.Data;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using UnityEditor;
+using PackageInfo = UnityEditor.PackageManager.PackageInfo;
+
+namespace AssetStoreTools.Uploader.Data
+{
+    internal class AssetsWorkflow : WorkflowBase
+    {
+        public override string Name => "AssetsWorkflow";
+        public override string DisplayName => "From Assets Folder";
+        public override string PackageExtension => ".unitypackage";
+        public override bool IsPathSet => !string.IsNullOrEmpty(_mainExportPath);
+        public bool IsCompleteProject => Package.IsCompleteProject;
+
+        private AssetsWorkflowState _stateData;
+
+        private string _mainExportPath;
+        private bool _includeDependencies;
+        private List<PackageInfo> _dependencies;
+        private List<string> _specialFolders;
+
+        public override event Action OnChanged;
+
+        // Special folders that would not work if not placed directly in the 'Assets' folder
+        private readonly string[] _extraAssetFolderNames =
+        {
+            "Editor Default Resources", "Gizmos", "Plugins",
+            "StreamingAssets", "Standard Assets", "WebGLTemplates",
+            "ExternalDependencyManager", "XR"
+        };
+
+        public AssetsWorkflow(IPackage package, AssetsWorkflowState stateData, IWorkflowServices services)
+            : base(package, services)
+        {
+            _stateData = stateData;
+            Deserialize();
+        }
+
+        public string GetMainExportPath()
+        {
+            return _mainExportPath;
+        }
+
+        public void SetMainExportPath(string path, bool serialize)
+        {
+            _mainExportPath = path;
+            SetMetadata();
+            if (serialize)
+                Serialize();
+        }
+
+        private void SetMetadata()
+        {
+            LocalPackageGuid = AssetDatabase.AssetPathToGUID(_mainExportPath);
+            LocalPackagePath = _mainExportPath;
+            LocalProjectPath = _mainExportPath;
+        }
+
+        public bool GetIncludeDependencies()
+        {
+            return _includeDependencies;
+        }
+
+        public void SetIncludeDependencies(bool value, bool serialize)
+        {
+            _includeDependencies = value;
+            // Note: make sure that exporting does not fail when
+            // a serialized dependency that has been removed from a project is sent to exporter
+            if (serialize)
+                Serialize();
+        }
+
+        public List<PackageInfo> GetDependencies()
+        {
+            return _dependencies;
+        }
+
+        public void SetDependencies(IEnumerable<string> dependencies, bool serialize)
+        {
+            _dependencies.Clear();
+            foreach (var dependency in dependencies)
+            {
+                if (!PackageUtility.GetPackageByPackageName(dependency, out var package))
+                    continue;
+                _dependencies.Add(package);
+            }
+
+            if (serialize)
+                Serialize();
+        }
+
+        public List<string> GetSpecialFolders()
+        {
+            return _specialFolders;
+        }
+
+        public void SetSpecialFolders(IEnumerable<string> specialFolders, bool serialize)
+        {
+            _specialFolders.Clear();
+            foreach (var folder in specialFolders)
+            {
+                _specialFolders.Add(folder);
+            }
+
+            if (serialize)
+                Serialize();
+        }
+
+        public override bool IsPathValid(string path, out string error)
+        {
+            error = string.Empty;
+
+            var pathIsFolder = Directory.Exists(path);
+            if (!pathIsFolder)
+            {
+                error = "Path must point to a valid folder";
+                return false;
+            }
+
+            var pathWithinAssetsFolder = path.StartsWith("Assets/") && path != "Assets/";
+            if (pathWithinAssetsFolder)
+                return true;
+
+            var pathIsAssetsFolder = path == "Assets" || path == "Assets/";
+            if (pathIsAssetsFolder)
+            {
+                var assetsFolderSelectionAllowed = Package.IsCompleteProject;
+                if (assetsFolderSelectionAllowed)
+                    return true;
+
+                error = "'Assets' folder is only available for packages tagged as a 'Complete Project'.";
+                return false;
+            }
+
+            error = "Selected folder path must be within the project's Assets.";
+            return false;
+        }
+
+        public List<string> GetAvailableDependencies()
+        {
+            var registryPackages = PackageUtility.GetAllRegistryPackages();
+            return registryPackages.Select(x => x.name).ToList();
+        }
+
+        public List<string> GetAvailableSpecialFolders()
+        {
+            var specialFolders = new List<string>();
+
+            foreach (var extraAssetFolderName in _extraAssetFolderNames)
+            {
+                var fullExtraPath = "Assets/" + extraAssetFolderName;
+
+                if (!Directory.Exists(fullExtraPath))
+                    continue;
+
+                if (_mainExportPath.ToLower().StartsWith(fullExtraPath.ToLower()))
+                    continue;
+
+                // Don't include nested paths
+                if (!fullExtraPath.ToLower().StartsWith(_mainExportPath.ToLower()))
+                    specialFolders.Add(fullExtraPath);
+            }
+
+            return specialFolders;
+        }
+
+        public override IEnumerable<string> GetAllPaths()
+        {
+            var paths = new List<string>()
+            {
+                _mainExportPath
+            };
+            paths.AddRange(GetSpecialFolders());
+
+            return paths;
+        }
+
+        public override IValidator CreateValidator()
+        {
+            var validationPaths = GetAllPaths();
+
+            var validationSettings = new CurrentProjectValidationSettings()
+            {
+                Category = Package.Category,
+                ValidationPaths = validationPaths.ToList(),
+                ValidationType = ValidationType.UnityPackage
+            };
+
+            var validator = new CurrentProjectValidator(validationSettings);
+            return validator;
+        }
+
+        public override IPackageExporter CreateExporter(string outputPath)
+        {
+            var exportPaths = GetAllPaths().ToList();
+
+            if (IsCompleteProject && !exportPaths.Contains("ProjectSettings"))
+            {
+                exportPaths.Add("ProjectSettings");
+            }
+
+            var dependenciesToInclude = new List<string>();
+            if (_includeDependencies)
+            {
+                dependenciesToInclude.AddRange(_dependencies.Select(x => x.name));
+            }
+
+            if (ASToolsPreferences.Instance.UseLegacyExporting)
+            {
+                var exportSettings = new LegacyExporterSettings()
+                {
+                    ExportPaths = exportPaths.ToArray(),
+                    OutputFilename = outputPath,
+                    IncludeDependencies = _includeDependencies,
+                };
+
+                return new LegacyPackageExporter(exportSettings);
+            }
+            else
+            {
+                var exportSettings = new DefaultExporterSettings()
+                {
+                    ExportPaths = exportPaths.ToArray(),
+                    OutputFilename = outputPath,
+                    Dependencies = dependenciesToInclude.ToArray(),
+                    PreviewGenerator = CreatePreviewGenerator(exportPaths),
+                };
+
+                return new DefaultPackageExporter(exportSettings);
+            }
+        }
+
+        protected override IPackageUploader CreatePackageUploader(string exportedPackagePath)
+        {
+            var uploaderSettings = new UnityPackageUploadSettings()
+            {
+                UnityPackagePath = exportedPackagePath,
+                VersionId = Package.VersionId,
+                RootGuid = LocalPackageGuid,
+                RootPath = LocalPackagePath,
+                ProjectPath = LocalProjectPath
+            };
+
+            var uploader = new UnityPackageUploader(uploaderSettings);
+            return uploader;
+        }
+
+        protected override void Serialize()
+        {
+            _stateData.SetMainPath(_mainExportPath);
+            _stateData.SetIncludeDependencies(_includeDependencies);
+            _stateData.SetDependencies(_dependencies.Select(x => x.name));
+            _stateData.SetSpecialFolders(_specialFolders);
+            OnChanged?.Invoke();
+        }
+
+        protected override void Deserialize()
+        {
+            _mainExportPath = _stateData.GetMainPath();
+
+            _specialFolders = new List<string>();
+            foreach (var path in _stateData.GetSpecialFolders())
+            {
+                _specialFolders.Add(path);
+            }
+
+            _includeDependencies = _stateData.GetIncludeDependencies();
+
+            _dependencies = new List<PackageInfo>();
+            foreach (var dependency in _stateData.GetDependencies())
+            {
+                if (!PackageUtility.GetPackageByPackageName(dependency, out var package))
+                    continue;
+
+                _dependencies.Add(package);
+            }
+
+            DeserializeFromUploadedData();
+        }
+
+        private void DeserializeFromUploadedData()
+        {
+            DeserializeFromUploadedDataByGuid();
+            DeserializeFromUploadedDataByPath();
+        }
+
+        private void DeserializeFromUploadedDataByGuid()
+        {
+            if (!string.IsNullOrEmpty(_mainExportPath))
+                return;
+
+            var lastUploadedGuid = Package.RootGuid;
+            if (string.IsNullOrEmpty(lastUploadedGuid))
+                return;
+
+            var potentialPackagePath = AssetDatabase.GUIDToAssetPath(lastUploadedGuid);
+            DeserializeFromUploadedDataByPath(potentialPackagePath);
+        }
+
+        private void DeserializeFromUploadedDataByPath()
+        {
+            if (!string.IsNullOrEmpty(_mainExportPath))
+                return;
+
+            var lastUploadedPath = Package.ProjectPath;
+            if (string.IsNullOrEmpty(lastUploadedPath))
+                return;
+
+            DeserializeFromUploadedDataByPath(lastUploadedPath);
+        }
+
+        private void DeserializeFromUploadedDataByPath(string path)
+        {
+            if (string.IsNullOrEmpty(path) || !IsPathValid(path, out var _))
+                return;
+
+            _mainExportPath = path;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/AssetsWorkflow.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/AssetsWorkflow.cs.meta
new file mode 100644
index 0000000..4e07adf
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/AssetsWorkflow.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 4657d35aaf9d70948a0840dc615f64ec
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/AssetsWorkflow.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/HybridPackageWorkflow.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/HybridPackageWorkflow.cs
new file mode 100644
index 0000000..9a093bc
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/HybridPackageWorkflow.cs
@@ -0,0 +1,251 @@
+using AssetStoreTools.Api;
+using AssetStoreTools.Exporter;
+using AssetStoreTools.Uploader.Data.Serialization;
+using AssetStoreTools.Utility;
+using AssetStoreTools.Validator;
+using AssetStoreTools.Validator.Data;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor;
+using UnityEditor.PackageManager;
+using PackageInfo = UnityEditor.PackageManager.PackageInfo;
+using PackageManager = UnityEditor.PackageManager;
+
+namespace AssetStoreTools.Uploader.Data
+{
+    internal class HybridPackageWorkflow : WorkflowBase
+    {
+        public override string Name => "HybridPackageWorkflow";
+        public override string DisplayName => "Local UPM Package";
+        public override string PackageExtension => ".unitypackage";
+        public override bool IsPathSet => _packageInfo != null;
+
+        private HybridPackageWorkflowState _stateData;
+
+        private PackageInfo _packageInfo;
+        private List<PackageInfo> _dependencies;
+
+        public override event Action OnChanged;
+
+        public HybridPackageWorkflow(IPackage package, HybridPackageWorkflowState stateData, IWorkflowServices services)
+            : base(package, services)
+        {
+            _stateData = stateData;
+            Deserialize();
+        }
+
+        public PackageInfo GetPackage()
+        {
+            return _packageInfo;
+        }
+
+        public void SetPackage(PackageInfo packageInfo, bool serialize)
+        {
+            if (packageInfo == null)
+                throw new ArgumentException("Package is null");
+
+            _packageInfo = packageInfo;
+            SetMetadata();
+            if (serialize)
+                Serialize();
+        }
+
+        public void SetPackage(string packageManifestPath, bool serialize)
+        {
+            if (!PackageUtility.GetPackageByManifestPath(packageManifestPath, out var package))
+                throw new ArgumentException("Path does not correspond to a valid package");
+
+            SetPackage(package, serialize);
+        }
+
+        private void SetMetadata()
+        {
+            LocalPackageGuid = AssetDatabase.AssetPathToGUID(AssetDatabase.GetAssetPath(_packageInfo.GetManifestAsset()));
+            LocalPackagePath = _packageInfo.assetPath;
+            LocalProjectPath = _packageInfo.name;
+        }
+
+        public List<PackageInfo> GetDependencies()
+        {
+            return _dependencies;
+        }
+
+        public void SetDependencies(IEnumerable<string> dependencies, bool serialize)
+        {
+            _dependencies.Clear();
+            foreach (var dependency in dependencies)
+            {
+                if (!PackageUtility.GetPackageByPackageName(dependency, out var package))
+                    continue;
+                _dependencies.Add(package);
+            }
+
+            if (serialize)
+                Serialize();
+        }
+
+        public List<PackageInfo> GetAvailableDependencies()
+        {
+            var availableDependencies = new List<PackageInfo>();
+            if (_packageInfo == null)
+                return availableDependencies;
+
+            var packageDependencies = _packageInfo.dependencies.Select(x => x.name);
+            foreach (var dependency in packageDependencies)
+            {
+                if (!PackageUtility.GetPackageByPackageName(dependency, out var package))
+                    continue;
+
+                if (package.source != PackageManager.PackageSource.Local
+                    && package.source != PackageManager.PackageSource.Embedded)
+                    continue;
+
+                availableDependencies.Add(package);
+            }
+
+            return availableDependencies;
+        }
+
+        public override IEnumerable<string> GetAllPaths()
+        {
+            var paths = new List<string>();
+
+            if (_packageInfo == null)
+                return paths;
+
+            paths.Add(_packageInfo.assetPath);
+            paths.AddRange(_dependencies.Select(x => x.assetPath));
+
+            return paths;
+        }
+
+        public override bool IsPathValid(string path, out string reason)
+        {
+            reason = string.Empty;
+
+            if (!PackageUtility.GetPackageByManifestPath(path, out var package))
+            {
+                reason = "Selected path must point to a package manifest for a package that is imported into the current project";
+                return false;
+            }
+
+            var packageSourceValid = package.source == PackageSource.Embedded || package.source == PackageSource.Local;
+            if (!packageSourceValid)
+            {
+                reason = "Selected package must be a local or an embedded package";
+                return false;
+            }
+
+            return true;
+        }
+
+        public override IValidator CreateValidator()
+        {
+            var validationPaths = GetAllPaths();
+
+            var validationSettings = new CurrentProjectValidationSettings()
+            {
+                Category = Package?.Category,
+                ValidationPaths = validationPaths.ToList(),
+                ValidationType = ValidationType.UnityPackage
+            };
+
+            var validator = new CurrentProjectValidator(validationSettings);
+            return validator;
+        }
+
+        public override IPackageExporter CreateExporter(string outputPath)
+        {
+            var exportPaths = GetAllPaths();
+
+            var exportSettings = new DefaultExporterSettings()
+            {
+                ExportPaths = exportPaths.ToArray(),
+                OutputFilename = outputPath,
+                PreviewGenerator = CreatePreviewGenerator(exportPaths.ToList())
+            };
+
+            return new DefaultPackageExporter(exportSettings);
+        }
+
+        protected override IPackageUploader CreatePackageUploader(string exportedPackagePath)
+        {
+            var uploaderSettings = new UnityPackageUploadSettings()
+            {
+                UnityPackagePath = exportedPackagePath,
+                VersionId = Package.VersionId,
+                RootGuid = LocalPackageGuid,
+                RootPath = LocalPackagePath,
+                ProjectPath = LocalProjectPath
+            };
+
+            var uploader = new UnityPackageUploader(uploaderSettings);
+            return uploader;
+        }
+
+        protected override void Serialize()
+        {
+            if (_packageInfo == null)
+                return;
+
+            _stateData.SetPackageName(_packageInfo.name);
+            _stateData.SetPackageDependencies(_dependencies.Select(x => x.name).OrderBy(x => x));
+            OnChanged?.Invoke();
+        }
+
+        protected override void Deserialize()
+        {
+            var packageName = _stateData.GetPackageName();
+            if (PackageUtility.GetPackageByPackageName(packageName, out var package))
+                _packageInfo = package;
+
+            _dependencies = new List<PackageInfo>();
+            var dependencies = _stateData.GetPackageDependencies();
+            foreach (var dependency in dependencies)
+            {
+                if (PackageUtility.GetPackageByPackageName(dependency, out var packageDependency))
+                    _dependencies.Add(packageDependency);
+            }
+
+            DeserializeFromUploadedData();
+        }
+
+        private void DeserializeFromUploadedData()
+        {
+            DeserializeFromUploadedDataByPackageName();
+            DeserializeFromUploadedDataByPackageGuid();
+        }
+
+        private void DeserializeFromUploadedDataByPackageName()
+        {
+            if (_packageInfo != null)
+                return;
+
+            var lastUploadedPackageName = Package.ProjectPath;
+            if (!PackageUtility.GetPackageByPackageName(lastUploadedPackageName, out var package))
+                return;
+
+            _packageInfo = package;
+        }
+
+        private void DeserializeFromUploadedDataByPackageGuid()
+        {
+            if (_packageInfo != null)
+                return;
+
+            var lastUploadedGuid = Package.RootGuid;
+            if (string.IsNullOrEmpty(lastUploadedGuid))
+                return;
+
+            var potentialPackageManifestPath = AssetDatabase.GUIDToAssetPath(lastUploadedGuid);
+            if (string.IsNullOrEmpty(potentialPackageManifestPath) || !IsPathValid(potentialPackageManifestPath, out var _))
+                return;
+
+            if (!PackageUtility.GetPackageByManifestPath(potentialPackageManifestPath, out var package))
+                return;
+
+            _packageInfo = package;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/HybridPackageWorkflow.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/HybridPackageWorkflow.cs.meta
new file mode 100644
index 0000000..8feba57
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/HybridPackageWorkflow.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 3061839aba3894246a20195639eeda1f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/HybridPackageWorkflow.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Package.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Package.cs
new file mode 100644
index 0000000..e46569d
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Package.cs
@@ -0,0 +1,91 @@
+using System;
+using UnityEngine;
+using PackageModel = AssetStoreTools.Api.Models.Package;
+
+namespace AssetStoreTools.Uploader.Data
+{
+    internal class Package : IPackage
+    {
+        private PackageModel _source;
+
+        public string PackageId => _source.PackageId;
+        public string VersionId => _source.VersionId;
+        public string Name => _source.Name;
+        public string Status => _source.Status;
+        public string Category => _source.Category;
+        public bool IsCompleteProject => _source.IsCompleteProject;
+        public string RootGuid => _source.RootGuid;
+        public string RootPath => _source.RootPath;
+        public string ProjectPath => _source.ProjectPath;
+        public string Modified => _source.Modified;
+        public string Size => _source.Size;
+        public string IconUrl => _source.IconUrl;
+        public bool IsDraft => Status.Equals("draft", StringComparison.OrdinalIgnoreCase);
+        public Texture2D Icon { get; private set; }
+
+        public event Action OnUpdate;
+        public event Action OnIconUpdate;
+
+        public Package(PackageModel packageSource)
+        {
+            _source = packageSource;
+        }
+
+        public void UpdateIcon(Texture2D texture)
+        {
+            if (texture == null)
+                return;
+
+            Icon = texture;
+            OnIconUpdate?.Invoke();
+        }
+
+        public string FormattedSize()
+        {
+            var defaultSize = "0.00 MB";
+            if (float.TryParse(Size, out var sizeBytes))
+                return $"{sizeBytes / (1024f * 1024f):0.00} MB";
+
+            return defaultSize;
+        }
+
+        public string FormattedModified()
+        {
+            var defaultDate = "Unknown";
+            if (DateTime.TryParse(Modified, out var dt))
+                return dt.Date.ToString("yyyy-MM-dd");
+
+            return defaultDate;
+        }
+
+        public void UpdateData(PackageModel source)
+        {
+            if (source == null)
+                throw new ArgumentException("Provided package is null");
+
+            _source = source;
+            OnUpdate?.Invoke();
+        }
+
+        public PackageModel ToModel()
+        {
+            var model = new PackageModel()
+            {
+                PackageId = _source.PackageId,
+                VersionId = _source.VersionId,
+                Name = _source.Name,
+                Status = _source.Status,
+                Category = _source.Category,
+                IsCompleteProject = _source.IsCompleteProject,
+                RootGuid = _source.RootGuid,
+                RootPath = _source.RootPath,
+                ProjectPath = _source.ProjectPath,
+                Modified = _source.Modified,
+                Size = _source.Size,
+                IconUrl = _source.IconUrl
+            };
+
+            return model;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Package.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Package.cs.meta
new file mode 100644
index 0000000..7e4f9df
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Package.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: fc2198164bbd6394b87c51a74fe2915e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Package.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/PackageContent.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/PackageContent.cs
new file mode 100644
index 0000000..5f02b55
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/PackageContent.cs
@@ -0,0 +1,68 @@
+using AssetStoreTools.Uploader.Data.Serialization;
+using AssetStoreTools.Uploader.Services;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace AssetStoreTools.Uploader.Data
+{
+    internal class PackageContent : IPackageContent
+    {
+        private IWorkflow _activeWorkflow;
+        private List<IWorkflow> _workflows;
+        private WorkflowStateData _workflowStateData;
+
+        private ICachingService _cachingService;
+
+        public event Action<IWorkflow> OnActiveWorkflowChanged;
+
+        public PackageContent(List<IWorkflow> workflows, WorkflowStateData workflowStateData, ICachingService cachingService)
+        {
+            _workflows = workflows;
+            _workflowStateData = workflowStateData;
+            _cachingService = cachingService;
+
+            foreach (var workflow in _workflows)
+            {
+                workflow.OnChanged += Serialize;
+            }
+
+            Deserialize();
+        }
+
+        public IWorkflow GetActiveWorkflow()
+        {
+            return _activeWorkflow;
+        }
+
+        public void SetActiveWorkflow(IWorkflow workflow)
+        {
+            _activeWorkflow = workflow;
+
+            OnActiveWorkflowChanged?.Invoke(_activeWorkflow);
+
+            Serialize();
+        }
+
+        public List<IWorkflow> GetAvailableWorkflows()
+        {
+            return _workflows;
+        }
+
+        private void Serialize()
+        {
+            _workflowStateData.SetActiveWorkflow(_activeWorkflow.Name);
+            _cachingService.CacheWorkflowStateData(_workflowStateData);
+        }
+
+        private void Deserialize()
+        {
+            var serializedWorkflow = _workflowStateData.GetActiveWorkflow();
+            var workflow = _workflows.FirstOrDefault(x => x.Name == serializedWorkflow);
+            if (workflow != null)
+                _activeWorkflow = workflow;
+            else
+                _activeWorkflow = _workflows[0];
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/PackageContent.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/PackageContent.cs.meta
new file mode 100644
index 0000000..641626b
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/PackageContent.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: f36086f9380a49949ab45463abc6fee8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/PackageContent.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/PackageGroup.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/PackageGroup.cs
new file mode 100644
index 0000000..3f94010
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/PackageGroup.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace AssetStoreTools.Uploader.Data
+{
+    internal class PackageGroup : IPackageGroup
+    {
+        private class FilteredPackage
+        {
+            public IPackage Package;
+            public bool IsInFilter;
+        }
+
+        public string Name { get; private set; }
+        public List<IPackage> Packages { get; private set; }
+
+        private List<FilteredPackage> _filteredPackages;
+
+        public event Action<List<IPackage>> OnPackagesSorted;
+        public event Action<List<IPackage>> OnPackagesFiltered;
+
+        public PackageGroup(string name, List<IPackage> packages)
+        {
+            Name = name;
+            Packages = packages;
+
+            _filteredPackages = new List<FilteredPackage>();
+            foreach (var package in Packages)
+                _filteredPackages.Add(new FilteredPackage() { Package = package, IsInFilter = true });
+        }
+
+        public void Sort(PackageSorting sortingType)
+        {
+            switch (sortingType)
+            {
+                case PackageSorting.Name:
+                    _filteredPackages = _filteredPackages.OrderBy(x => x.Package.Name).ToList();
+                    break;
+                case PackageSorting.Date:
+                    _filteredPackages = _filteredPackages.OrderByDescending(x => x.Package.Modified).ToList();
+                    break;
+                case PackageSorting.Category:
+                    _filteredPackages = _filteredPackages.OrderBy(x => x.Package.Category).ThenBy(x => x.Package.Name).ToList();
+                    break;
+                default:
+                    throw new NotImplementedException("Undefined sorting type");
+            }
+
+            OnPackagesSorted?.Invoke(_filteredPackages.Where(x => x.IsInFilter).Select(x => x.Package).ToList());
+        }
+
+        public void Filter(string filter)
+        {
+            foreach (var package in _filteredPackages)
+            {
+                bool inFilter = package.Package.Name.ToLower().Contains(filter.ToLower());
+                package.IsInFilter = inFilter;
+            }
+
+            OnPackagesFiltered?.Invoke(_filteredPackages.Where(x => x.IsInFilter).Select(x => x.Package).ToList());
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/PackageGroup.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/PackageGroup.cs.meta
new file mode 100644
index 0000000..a8f9623
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/PackageGroup.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: c9cc17f6b95bb2c42913a1451b9af29e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/PackageGroup.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/PackageSorting.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/PackageSorting.cs
new file mode 100644
index 0000000..cfd31da
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/PackageSorting.cs
@@ -0,0 +1,9 @@
+namespace AssetStoreTools.Uploader.Data
+{
+    internal enum PackageSorting
+    {
+        Name,
+        Category,
+        Date
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/PackageSorting.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/PackageSorting.cs.meta
new file mode 100644
index 0000000..de09cab
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/PackageSorting.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: b1d61d0de90e022469b5ed312d4b7beb
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/PackageSorting.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization.meta
new file mode 100644
index 0000000..2ba3d4c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0b05e199f21f636439844a8cc7e2c225
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/AssetPath.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/AssetPath.cs
new file mode 100644
index 0000000..695a27a
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/AssetPath.cs
@@ -0,0 +1,59 @@
+using AssetStoreTools.Utility;
+using Newtonsoft.Json;
+using System.IO;
+using UnityEditor;
+
+namespace AssetStoreTools.Uploader.Data.Serialization
+{
+    internal class AssetPath
+    {
+        [JsonProperty("path")]
+        private string _path = string.Empty;
+        [JsonProperty("guid")]
+        private string _guid = string.Empty;
+
+        [JsonIgnore]
+        public string Path { get => _path; set { SetAssetPath(value); } }
+        [JsonIgnore]
+        public string Guid { get => _guid; set { _guid = value; } }
+
+        public AssetPath() { }
+
+        public AssetPath(string path)
+        {
+            SetAssetPath(path);
+        }
+
+        private void SetAssetPath(string path)
+        {
+            _path = path.Replace("\\", "/");
+            if (TryGetGuid(_path, out var guid))
+                _guid = guid;
+        }
+
+        private bool TryGetGuid(string path, out string guid)
+        {
+            guid = string.Empty;
+
+            var relativePath = FileUtility.AbsolutePathToRelativePath(path, ASToolsPreferences.Instance.EnableSymlinkSupport);
+
+            if (!relativePath.StartsWith("Assets/") && !relativePath.StartsWith("Packages/"))
+                return false;
+
+            guid = AssetDatabase.AssetPathToGUID(relativePath);
+            return !string.IsNullOrEmpty(guid);
+        }
+
+        public override string ToString()
+        {
+            var pathFromGuid = AssetDatabase.GUIDToAssetPath(_guid);
+            if (!string.IsNullOrEmpty(pathFromGuid) && (File.Exists(pathFromGuid) || Directory.Exists(pathFromGuid)))
+                return pathFromGuid;
+
+            if (File.Exists(_path) || Directory.Exists(_path))
+                return _path;
+
+            return string.Empty;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/AssetPath.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/AssetPath.cs.meta
new file mode 100644
index 0000000..3529bc1
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/AssetPath.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 920ff8e4ffe77ec44bede985593cc187
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/AssetPath.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/AssetsWorkflowStateData.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/AssetsWorkflowStateData.cs
new file mode 100644
index 0000000..4f7cf7f
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/AssetsWorkflowStateData.cs
@@ -0,0 +1,77 @@
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace AssetStoreTools.Uploader.Data.Serialization
+{
+    internal class AssetsWorkflowState
+    {
+        [JsonProperty("main_path")]
+        private AssetPath _mainPath;
+        [JsonProperty("special_folders")]
+        private List<AssetPath> _specialFolders;
+        [JsonProperty("include_dependencies")]
+        private bool _includeDependencies;
+        [JsonProperty("dependencies")]
+        private List<string> _dependencies;
+
+        public AssetsWorkflowState()
+        {
+            _mainPath = new AssetPath();
+            _includeDependencies = false;
+            _dependencies = new List<string>();
+            _specialFolders = new List<AssetPath>();
+        }
+
+        public string GetMainPath()
+        {
+            return _mainPath?.ToString();
+        }
+
+        public void SetMainPath(string path)
+        {
+            _mainPath = new AssetPath(path);
+        }
+
+        public bool GetIncludeDependencies()
+        {
+            return _includeDependencies;
+        }
+
+        public void SetIncludeDependencies(bool value)
+        {
+            _includeDependencies = value;
+        }
+
+        public List<string> GetDependencies()
+        {
+            return _dependencies;
+        }
+
+        public void SetDependencies(IEnumerable<string> dependencies)
+        {
+            _dependencies = new List<string>();
+            foreach (var dependency in dependencies)
+                _dependencies.Add(dependency);
+        }
+
+        public List<string> GetSpecialFolders()
+        {
+            var specialFolders = new List<string>();
+            foreach (var folder in _specialFolders)
+            {
+                var path = folder.ToString();
+                if (!string.IsNullOrEmpty(path))
+                    specialFolders.Add(path);
+            }
+
+            return specialFolders;
+        }
+
+        public void SetSpecialFolders(List<string> specialFolders)
+        {
+            _specialFolders = new List<AssetPath>();
+            foreach (var path in specialFolders)
+                _specialFolders.Add(new AssetPath(path));
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/AssetsWorkflowStateData.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/AssetsWorkflowStateData.cs.meta
new file mode 100644
index 0000000..8c7d477
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/AssetsWorkflowStateData.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 505f0a5aa753b4445a467539e150190a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/AssetsWorkflowStateData.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/HybridPackageWorkflowState.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/HybridPackageWorkflowState.cs
new file mode 100644
index 0000000..69ec221
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/HybridPackageWorkflowState.cs
@@ -0,0 +1,41 @@
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace AssetStoreTools.Uploader.Data.Serialization
+{
+    internal class HybridPackageWorkflowState
+    {
+        [JsonProperty("package_name")]
+        private string _packageName;
+        [JsonProperty("dependencies")]
+        private List<string> _dependencies;
+
+        public HybridPackageWorkflowState()
+        {
+            _packageName = string.Empty;
+            _dependencies = new List<string>();
+        }
+
+        public string GetPackageName()
+        {
+            return _packageName;
+        }
+
+        public void SetPackageName(string packageName)
+        {
+            _packageName = packageName;
+        }
+
+        public List<string> GetPackageDependencies()
+        {
+            return _dependencies;
+        }
+
+        public void SetPackageDependencies(IEnumerable<string> dependencies)
+        {
+            _dependencies.Clear();
+            foreach (var dependency in dependencies)
+                _dependencies.Add(dependency);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/HybridPackageWorkflowState.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/HybridPackageWorkflowState.cs.meta
new file mode 100644
index 0000000..7b9f72a
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/HybridPackageWorkflowState.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 2848375fcb0a4174495573190bfc3900
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/HybridPackageWorkflowState.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/UnityPackageWorkflowStateData.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/UnityPackageWorkflowStateData.cs
new file mode 100644
index 0000000..166e51d
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/UnityPackageWorkflowStateData.cs
@@ -0,0 +1,25 @@
+using Newtonsoft.Json;
+
+namespace AssetStoreTools.Uploader.Data.Serialization
+{
+    internal class UnityPackageWorkflowState
+    {
+        [JsonProperty("package_path")]
+        private AssetPath _packagePath;
+
+        public UnityPackageWorkflowState()
+        {
+            _packagePath = new AssetPath();
+        }
+
+        public string GetPackagePath()
+        {
+            return _packagePath?.ToString();
+        }
+
+        public void SetPackagePath(string path)
+        {
+            _packagePath = new AssetPath(path);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/UnityPackageWorkflowStateData.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/UnityPackageWorkflowStateData.cs.meta
new file mode 100644
index 0000000..65f718e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/UnityPackageWorkflowStateData.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 101a66adc88639b43b07cc28214474cf
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/UnityPackageWorkflowStateData.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/WorkflowStateData.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/WorkflowStateData.cs
new file mode 100644
index 0000000..48e4275
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/WorkflowStateData.cs
@@ -0,0 +1,68 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+
+namespace AssetStoreTools.Uploader.Data.Serialization
+{
+    internal class WorkflowStateData
+    {
+        [JsonProperty("package_id")]
+        private string _packageId;
+        [JsonProperty("active_workflow")]
+        private string _activeWorkflow;
+        [JsonProperty("assets_workflow")]
+        private AssetsWorkflowState _assetsWorkflow;
+        [JsonProperty("unitypackage_workflow")]
+        private UnityPackageWorkflowState _unityPackageWorkflow;
+        [JsonProperty("hybrid_workflow")]
+        private HybridPackageWorkflowState _hybridPackageWorkflow;
+
+        public WorkflowStateData()
+        {
+            _activeWorkflow = string.Empty;
+
+            _assetsWorkflow = new AssetsWorkflowState();
+            _unityPackageWorkflow = new UnityPackageWorkflowState();
+            _hybridPackageWorkflow = new HybridPackageWorkflowState();
+        }
+
+        public WorkflowStateData(string packageId) : this()
+        {
+            SetPackageId(packageId);
+        }
+
+        public string GetPackageId()
+        {
+            return _packageId;
+        }
+
+        public void SetPackageId(string packageId)
+        {
+            _packageId = packageId;
+        }
+
+        public string GetActiveWorkflow()
+        {
+            return _activeWorkflow;
+        }
+
+        public void SetActiveWorkflow(string activeWorkflow)
+        {
+            _activeWorkflow = activeWorkflow;
+        }
+
+        public AssetsWorkflowState GetAssetsWorkflowState()
+        {
+            return _assetsWorkflow;
+        }
+
+        public UnityPackageWorkflowState GetUnityPackageWorkflowState()
+        {
+            return _unityPackageWorkflow;
+        }
+
+        public HybridPackageWorkflowState GetHybridPackageWorkflowState()
+        {
+            return _hybridPackageWorkflow;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/WorkflowStateData.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/WorkflowStateData.cs.meta
new file mode 100644
index 0000000..5fb8995
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/WorkflowStateData.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: eecebbc83661a4f41a14e293c9fc3331
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/Serialization/WorkflowStateData.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/UnityPackageWorkflow.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/UnityPackageWorkflow.cs
new file mode 100644
index 0000000..8b8b2c1
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/UnityPackageWorkflow.cs
@@ -0,0 +1,135 @@
+using AssetStoreTools.Api;
+using AssetStoreTools.Exporter;
+using AssetStoreTools.Uploader.Data.Serialization;
+using AssetStoreTools.Validator;
+using AssetStoreTools.Validator.Data;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+
+namespace AssetStoreTools.Uploader.Data
+{
+    internal class UnityPackageWorkflow : WorkflowBase
+    {
+        public override string Name => "UnityPackageWorkflow";
+        public override string DisplayName => "Pre-exported .unitypackage";
+        public override string PackageExtension => ".unitypackage";
+        public override bool IsPathSet => !string.IsNullOrEmpty(_packagePath);
+
+        private UnityPackageWorkflowState _workflowState;
+        private string _packagePath;
+
+        public override event Action OnChanged;
+
+        public UnityPackageWorkflow(IPackage package, UnityPackageWorkflowState workflowState, IWorkflowServices services)
+            : base(package, services)
+        {
+            _workflowState = workflowState;
+            Deserialize();
+        }
+
+        public void SetPackagePath(string path, bool serialize)
+        {
+            _packagePath = path;
+            SetMetadata();
+            if (serialize)
+                Serialize();
+        }
+
+        private void SetMetadata()
+        {
+            LocalPackageGuid = string.Empty;
+            LocalPackagePath = string.Empty;
+            LocalProjectPath = _packagePath;
+        }
+
+        public string GetPackagePath()
+        {
+            return _packagePath;
+        }
+
+        public override IEnumerable<string> GetAllPaths()
+        {
+            return new List<string>() { _packagePath };
+        }
+
+        public override bool IsPathValid(string path, out string error)
+        {
+            error = null;
+
+            var pathIsUnityPackage = path.EndsWith(PackageExtension);
+            var pathExists = File.Exists(path);
+
+            if (!pathIsUnityPackage || !pathExists)
+            {
+                error = "Path must point to a .unitypackage file";
+                return false;
+            }
+
+            return true;
+        }
+
+        public override IValidator CreateValidator()
+        {
+            var validationSettings = new ExternalProjectValidationSettings()
+            {
+                Category = Package.Category,
+                PackagePath = GetPackagePath()
+            };
+
+            var validator = new ExternalProjectValidator(validationSettings);
+            return validator;
+        }
+
+        public override IPackageExporter CreateExporter(string _)
+        {
+            // This workflow already takes exported packages as input
+            throw new InvalidOperationException($"{nameof(UnityPackageWorkflow)} already takes exported packages as input");
+        }
+
+        public override Task<PackageExporterResult> ExportPackage(string _)
+        {
+            return Task.FromResult(new PackageExporterResult() { Success = true, ExportedPath = GetPackagePath() });
+        }
+
+        protected override IPackageUploader CreatePackageUploader(string exportedPackagePath)
+        {
+            var uploaderSettings = new UnityPackageUploadSettings()
+            {
+                VersionId = Package.VersionId,
+                UnityPackagePath = exportedPackagePath,
+                RootGuid = LocalPackageGuid,
+                RootPath = LocalPackagePath,
+                ProjectPath = LocalProjectPath
+            };
+
+            var uploader = new UnityPackageUploader(uploaderSettings);
+            return uploader;
+        }
+
+        protected override void Serialize()
+        {
+            _workflowState.SetPackagePath(_packagePath);
+            OnChanged?.Invoke();
+        }
+
+        protected override void Deserialize()
+        {
+            _packagePath = _workflowState.GetPackagePath();
+            DeserializeFromUploadedData();
+        }
+
+        private void DeserializeFromUploadedData()
+        {
+            if (!string.IsNullOrEmpty(_packagePath))
+                return;
+
+            var potentialPackagePath = Package.ProjectPath;
+            if (string.IsNullOrEmpty(potentialPackagePath) || !IsPathValid(potentialPackagePath, out var _))
+                return;
+
+            _packagePath = potentialPackagePath;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/UnityPackageWorkflow.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/UnityPackageWorkflow.cs.meta
new file mode 100644
index 0000000..0179b48
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/UnityPackageWorkflow.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 47ee1db30792bf84aa1af8be7ce0dee6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/UnityPackageWorkflow.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/WorkflowServices.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/WorkflowServices.cs
new file mode 100644
index 0000000..95bd9cf
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/WorkflowServices.cs
@@ -0,0 +1,53 @@
+using AssetStoreTools.Api;
+using AssetStoreTools.Api.Responses;
+using AssetStoreTools.Uploader.Services.Analytics;
+using AssetStoreTools.Uploader.Services.Analytics.Data;
+using AssetStoreTools.Uploader.Services.Api;
+using System;
+using System.Threading.Tasks;
+using UnityEngine.Analytics;
+
+namespace AssetStoreTools.Uploader.Data
+{
+    internal class WorkflowServices : IWorkflowServices
+    {
+        private IPackageDownloadingService _downloadingService;
+        private IPackageUploadingService _uploadingService;
+        private IAnalyticsService _analyticsService;
+
+        public WorkflowServices(
+            IPackageDownloadingService downloadingService,
+            IPackageUploadingService uploadingService,
+            IAnalyticsService analyticsService)
+        {
+            _downloadingService = downloadingService;
+            _uploadingService = uploadingService;
+            _analyticsService = analyticsService;
+        }
+
+        public Task<PackageUploadedUnityVersionDataResponse> GetPackageUploadedVersions(IPackage package, int timeoutMs)
+        {
+            return _downloadingService.GetPackageUploadedVersions(package, timeoutMs);
+        }
+
+        public Task<PackageUploadResponse> UploadPackage(IPackageUploader uploader, IProgress<float> progress)
+        {
+            return _uploadingService.UploadPackage(uploader, progress);
+        }
+
+        public void StopUploading(IPackageUploader uploader)
+        {
+            _uploadingService.StopUploading(uploader);
+        }
+
+        public Task<RefreshedPackageDataResponse> UpdatePackageData(IPackage package)
+        {
+            return _downloadingService.UpdatePackageData(package);
+        }
+
+        public AnalyticsResult SendAnalytic(IAssetStoreAnalytic data)
+        {
+            return _analyticsService.Send(data);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/WorkflowServices.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/WorkflowServices.cs.meta
new file mode 100644
index 0000000..535d449
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/WorkflowServices.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: a78b96ae30966e94ba9ffdddf19c1692
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Data/WorkflowServices.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services.meta
new file mode 100644
index 0000000..6d1acef
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d9787842821f3d041904186d0e0cc61d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics.meta
new file mode 100644
index 0000000..30b3cbf
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 17f95678acdb51548908d81be7146b5b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/AnalyticsService.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/AnalyticsService.cs
new file mode 100644
index 0000000..860b2a1
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/AnalyticsService.cs
@@ -0,0 +1,45 @@
+using AssetStoreTools.Uploader.Services.Analytics.Data;
+using UnityEditor;
+using UnityEngine.Analytics;
+#if !UNITY_2023_2_OR_NEWER
+using AnalyticsConstants = AssetStoreTools.Constants.Uploader.Analytics;
+#endif
+
+namespace AssetStoreTools.Uploader.Services.Analytics
+{
+    internal class AnalyticsService : IAnalyticsService
+    {
+        public AnalyticsResult Send(IAssetStoreAnalytic analytic)
+        {
+            if (!EditorAnalytics.enabled)
+                return AnalyticsResult.AnalyticsDisabled;
+
+            if (!Register(analytic))
+                return AnalyticsResult.AnalyticsDisabled;
+
+#if UNITY_2023_2_OR_NEWER
+            return EditorAnalytics.SendAnalytic(analytic);
+#else
+            return EditorAnalytics.SendEventWithLimit(analytic.EventName,
+                analytic.Data,
+                analytic.EventVersion);
+#endif
+        }
+
+        private bool Register(IAssetStoreAnalytic analytic)
+        {
+#if UNITY_2023_2_OR_NEWER
+            return true;
+#else
+            var result = EditorAnalytics.RegisterEventWithLimit(
+                eventName: analytic.EventName,
+                maxEventPerHour: AnalyticsConstants.MaxEventsPerHour,
+                maxItems: AnalyticsConstants.MaxNumberOfElements,
+                vendorKey: AnalyticsConstants.VendorKey,
+                ver: analytic.EventVersion);
+
+            return result == AnalyticsResult.Ok;
+#endif
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/AnalyticsService.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/AnalyticsService.cs.meta
new file mode 100644
index 0000000..0b230a0
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/AnalyticsService.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 408b5b0136da9ca4f9598b8688f6210e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/AnalyticsService.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data.meta
new file mode 100644
index 0000000..59ec0e4
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: df1fca726619f2f4fae3bd93b0ef5a8b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/AuthenticationAnalytic.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/AuthenticationAnalytic.cs
new file mode 100644
index 0000000..5f0fc4d
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/AuthenticationAnalytic.cs
@@ -0,0 +1,46 @@
+using AssetStoreTools.Api;
+using System;
+#if UNITY_2023_2_OR_NEWER
+using UnityEngine.Analytics;
+#endif
+using AnalyticsConstants = AssetStoreTools.Constants.Uploader.Analytics;
+
+namespace AssetStoreTools.Uploader.Services.Analytics.Data
+{
+#if UNITY_2023_2_OR_NEWER
+    [AnalyticInfo
+    (eventName: AnalyticsConstants.AuthenticationAnalytics.EventName,
+    vendorKey: AnalyticsConstants.VendorKey,
+    version: AnalyticsConstants.AuthenticationAnalytics.EventVersion,
+    maxEventsPerHour: AnalyticsConstants.MaxEventsPerHour,
+    maxNumberOfElements: AnalyticsConstants.MaxNumberOfElements)]
+#endif
+    internal class AuthenticationAnalytic : BaseAnalytic
+    {
+        [Serializable]
+        public class AuthenticationAnalyticData : BaseAnalyticData
+        {
+            public string AuthenticationType;
+            public string PublisherId;
+        }
+
+        public override string EventName => AnalyticsConstants.AuthenticationAnalytics.EventName;
+        public override int EventVersion => AnalyticsConstants.AuthenticationAnalytics.EventVersion;
+
+        private AuthenticationAnalyticData _data;
+
+        public AuthenticationAnalytic(IAuthenticationType authenticationType, string publisherId)
+        {
+            _data = new AuthenticationAnalyticData
+            {
+                AuthenticationType = authenticationType.GetType().Name,
+                PublisherId = publisherId
+            };
+        }
+
+        protected override BaseAnalyticData GetData()
+        {
+            return _data;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/AuthenticationAnalytic.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/AuthenticationAnalytic.cs.meta
new file mode 100644
index 0000000..b7c28ed
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/AuthenticationAnalytic.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 4b9389e3ee578484493d36775c75baa1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/AuthenticationAnalytic.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/BaseAnalytic.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/BaseAnalytic.cs
new file mode 100644
index 0000000..c13df93
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/BaseAnalytic.cs
@@ -0,0 +1,35 @@
+using System;
+#if UNITY_2023_2_OR_NEWER
+using UnityEngine.Analytics;
+#endif
+
+namespace AssetStoreTools.Uploader.Services.Analytics.Data
+{
+    internal abstract class BaseAnalytic : IAssetStoreAnalytic
+    {
+        [Serializable]
+        public class BaseAnalyticData : IAssetStoreAnalyticData
+        {
+            public string ToolVersion = Constants.Api.ApiVersion;
+        }
+
+        public abstract string EventName { get; }
+        public abstract int EventVersion { get; }
+
+        public IAssetStoreAnalyticData Data => GetData();
+        protected abstract BaseAnalyticData GetData();
+
+#if UNITY_2023_2_OR_NEWER
+        public bool TryGatherData(out IAnalytic.IData data, [System.Diagnostics.CodeAnalysis.NotNullWhen(false)] out Exception error)
+        {
+            error = null;
+            data = Data;
+
+            if (data == null)
+                error = new Exception("Analytic data is null");
+
+            return error == null;
+        }
+#endif
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/BaseAnalytic.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/BaseAnalytic.cs.meta
new file mode 100644
index 0000000..a423c7e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/BaseAnalytic.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 51ec1e4b6505b694ab01f7c523744fbc
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/BaseAnalytic.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/IAssetStoreAnalytic.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/IAssetStoreAnalytic.cs
new file mode 100644
index 0000000..f94afd2
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/IAssetStoreAnalytic.cs
@@ -0,0 +1,16 @@
+#if UNITY_2023_2_OR_NEWER
+using UnityEngine.Analytics;
+#endif
+
+namespace AssetStoreTools.Uploader.Services.Analytics.Data
+{
+    internal interface IAssetStoreAnalytic
+#if UNITY_2023_2_OR_NEWER
+        : IAnalytic
+#endif
+    {
+        string EventName { get; }
+        int EventVersion { get; }
+        IAssetStoreAnalyticData Data { get; }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/IAssetStoreAnalytic.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/IAssetStoreAnalytic.cs.meta
new file mode 100644
index 0000000..18e344d
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/IAssetStoreAnalytic.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 6e9b53aa176bbed48bafa538c26df304
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/IAssetStoreAnalytic.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/IAssetStoreAnalyticData.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/IAssetStoreAnalyticData.cs
new file mode 100644
index 0000000..0175c64
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/IAssetStoreAnalyticData.cs
@@ -0,0 +1,8 @@
+namespace AssetStoreTools.Uploader.Services.Analytics.Data
+{
+    interface IAssetStoreAnalyticData
+#if UNITY_2023_2_OR_NEWER
+            : UnityEngine.Analytics.IAnalytic.IData
+#endif
+    { }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/IAssetStoreAnalyticData.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/IAssetStoreAnalyticData.cs.meta
new file mode 100644
index 0000000..a79af8d
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/IAssetStoreAnalyticData.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: b639e25d9b9abd34d8eb67b0e17dde86
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/IAssetStoreAnalyticData.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/PackageUploadAnalytic.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/PackageUploadAnalytic.cs
new file mode 100644
index 0000000..58121ee
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/PackageUploadAnalytic.cs
@@ -0,0 +1,72 @@
+using AssetStoreTools.Api;
+using AssetStoreTools.Validator.Data;
+using System;
+#if UNITY_2023_2_OR_NEWER
+using UnityEngine.Analytics;
+#endif
+using AnalyticsConstants = AssetStoreTools.Constants.Uploader.Analytics;
+
+namespace AssetStoreTools.Uploader.Services.Analytics.Data
+{
+#if UNITY_2023_2_OR_NEWER
+    [AnalyticInfo
+    (eventName: AnalyticsConstants.PackageUploadAnalytics.EventName,
+    vendorKey: AnalyticsConstants.VendorKey,
+    version: AnalyticsConstants.PackageUploadAnalytics.EventVersion,
+    maxEventsPerHour: AnalyticsConstants.MaxEventsPerHour,
+    maxNumberOfElements: AnalyticsConstants.MaxNumberOfElements)]
+#endif
+    internal class PackageUploadAnalytic : BaseAnalytic
+    {
+        [Serializable]
+        public class PackageUploadAnalyticData : BaseAnalyticData
+        {
+            public string PackageId;
+            public string Category;
+            public bool UsedValidator;
+            public string ValidatorResults;
+            public string UploadFinishedReason;
+            public double TimeTaken;
+            public long PackageSize;
+            public string Workflow;
+            public string EndpointUrl;
+        }
+
+        public override string EventName => AnalyticsConstants.PackageUploadAnalytics.EventName;
+        public override int EventVersion => AnalyticsConstants.PackageUploadAnalytics.EventVersion;
+
+        private PackageUploadAnalyticData _data;
+
+        public PackageUploadAnalytic(
+            string packageId,
+            string category,
+            bool usedValidator,
+            ValidationSettings validationSettings,
+            ValidationResult validationResult,
+            UploadStatus uploadFinishedReason,
+            double timeTaken,
+            long packageSize,
+            string workflow
+            )
+        {
+            _data = new PackageUploadAnalyticData()
+            {
+                PackageId = packageId,
+                Category = category,
+                UsedValidator = usedValidator,
+                ValidatorResults = usedValidator ?
+                    ValidationResultsSerializer.ConstructValidationResultsJson(validationSettings, validationResult) : null,
+                UploadFinishedReason = uploadFinishedReason.ToString(),
+                TimeTaken = timeTaken,
+                PackageSize = packageSize,
+                Workflow = workflow,
+                EndpointUrl = Constants.Api.AssetStoreBaseUrl
+            };
+        }
+
+        protected override BaseAnalyticData GetData()
+        {
+            return _data;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/PackageUploadAnalytic.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/PackageUploadAnalytic.cs.meta
new file mode 100644
index 0000000..6e329eb
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/PackageUploadAnalytic.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 6cc34de12dce9964b9c900d5bb159966
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/PackageUploadAnalytic.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/ValidationResultsSerializer.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/ValidationResultsSerializer.cs
new file mode 100644
index 0000000..f002bee
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/ValidationResultsSerializer.cs
@@ -0,0 +1,91 @@
+using AssetStoreTools.Validator.Data;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace AssetStoreTools.Uploader.Services.Analytics.Data
+{
+    internal class ValidationResultsSerializer
+    {
+        private class ValidationResults
+        {
+            public bool HasCompilationErrors;
+            public string[] Paths;
+            public Dictionary<string, TestResultOutcome> Results;
+        }
+
+        private class TestResultOutcome
+        {
+            public int IntegerValue;
+            public string StringValue;
+
+            public TestResultOutcome(TestResultStatus status)
+            {
+                IntegerValue = (int)status;
+                StringValue = status.ToString();
+            }
+        }
+
+        private class ValidationResultsResolver : DefaultContractResolver
+        {
+            private static ValidationResultsResolver _instance;
+            public static ValidationResultsResolver Instance => _instance ?? (_instance = new ValidationResultsResolver());
+
+            private Dictionary<string, string> _propertyConversion;
+
+            private ValidationResultsResolver()
+            {
+                _propertyConversion = new Dictionary<string, string>()
+                {
+                    { nameof(ValidationResults.HasCompilationErrors), "has_compilation_errors" },
+                    { nameof(ValidationResults.Paths), "validation_paths" },
+                    { nameof(ValidationResults.Results), "validation_results" },
+                    { nameof(TestResultOutcome.IntegerValue), "int" },
+                    { nameof(TestResultOutcome.StringValue), "string" },
+                };
+            }
+
+            protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
+            {
+                var property = base.CreateProperty(member, memberSerialization);
+                if (_propertyConversion.ContainsKey(property.PropertyName))
+                    property.PropertyName = _propertyConversion[property.PropertyName];
+
+                return property;
+            }
+        }
+
+        public static string ConstructValidationResultsJson(ValidationSettings settings, ValidationResult result)
+        {
+            if (result == null)
+                return string.Empty;
+
+            var resultObject = new ValidationResults();
+            resultObject.HasCompilationErrors = result.HadCompilationErrors;
+
+            switch (settings)
+            {
+                case CurrentProjectValidationSettings currentProjectValidationSettings:
+                    resultObject.Paths = currentProjectValidationSettings.ValidationPaths.ToArray();
+                    break;
+                case ExternalProjectValidationSettings externalProjectValidationSettings:
+                    resultObject.Paths = new string[] { externalProjectValidationSettings.PackagePath };
+                    break;
+            }
+
+            resultObject.Results = new Dictionary<string, TestResultOutcome>();
+            foreach (var test in result.Tests)
+            {
+                resultObject.Results.Add(test.Id.ToString(), new TestResultOutcome(test.Result.Status));
+            }
+
+            var serializerSettings = new JsonSerializerSettings()
+            {
+                ContractResolver = ValidationResultsResolver.Instance
+            };
+
+            return JsonConvert.SerializeObject(resultObject, serializerSettings);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/ValidationResultsSerializer.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/ValidationResultsSerializer.cs.meta
new file mode 100644
index 0000000..0dddcc2
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/ValidationResultsSerializer.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: fa15fc27c7f3d044884885b3dad73efc
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/Data/ValidationResultsSerializer.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/IAnalyticsService.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/IAnalyticsService.cs
new file mode 100644
index 0000000..ffe351e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/IAnalyticsService.cs
@@ -0,0 +1,10 @@
+using AssetStoreTools.Uploader.Services.Analytics.Data;
+using UnityEngine.Analytics;
+
+namespace AssetStoreTools.Uploader.Services.Analytics
+{
+    internal interface IAnalyticsService : IUploaderService
+    {
+        AnalyticsResult Send(IAssetStoreAnalytic analytic);
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/IAnalyticsService.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/IAnalyticsService.cs.meta
new file mode 100644
index 0000000..2924eab
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/IAnalyticsService.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: faa1f39fc83b86b438f6e0f34f01167b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Analytics/IAnalyticsService.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api.meta
new file mode 100644
index 0000000..7075aa4
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4d983b64bd0866a428f937434252f537
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/AuthenticationService.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/AuthenticationService.cs
new file mode 100644
index 0000000..226d5d4
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/AuthenticationService.cs
@@ -0,0 +1,100 @@
+using AssetStoreTools.Api;
+using AssetStoreTools.Api.Models;
+using AssetStoreTools.Api.Responses;
+using AssetStoreTools.Uploader.Services.Analytics;
+using AssetStoreTools.Uploader.Services.Analytics.Data;
+using AssetStoreTools.Utility;
+using System;
+using System.Threading.Tasks;
+using UnityEditor;
+
+namespace AssetStoreTools.Uploader.Services.Api
+{
+    internal class AuthenticationService : IAuthenticationService
+    {
+        private IAssetStoreApi _api;
+        private ICachingService _cachingService;
+        private IAnalyticsService _analyticsService;
+
+        public User User { get; private set; }
+
+        public AuthenticationService(IAssetStoreApi api, ICachingService cachingService, IAnalyticsService analyticsService)
+        {
+            _api = api;
+            _cachingService = cachingService;
+            _analyticsService = analyticsService;
+        }
+
+        public async Task<AuthenticationResponse> AuthenticateWithCredentials(string email, string password)
+        {
+            var authenticationType = new CredentialsAuthentication(email, password);
+            return await Authenticate(authenticationType);
+        }
+
+        public async Task<AuthenticationResponse> AuthenticateWithSessionToken()
+        {
+            if (!_cachingService.GetCachedSessionToken(out var cachedSessionToken))
+            {
+                return new AuthenticationResponse() { Success = false, Exception = new Exception("No cached session token found") };
+            }
+
+            var authenticationType = new SessionAuthentication(cachedSessionToken);
+            return await Authenticate(authenticationType);
+        }
+
+        public async Task<AuthenticationResponse> AuthenticateWithCloudToken()
+        {
+            var authenticationType = new CloudTokenAuthentication(CloudProjectSettings.accessToken);
+            return await Authenticate(authenticationType);
+        }
+
+        private async Task<AuthenticationResponse> Authenticate(IAuthenticationType authenticationType)
+        {
+            var response = await _api.Authenticate(authenticationType);
+            HandleLoginResponse(authenticationType, response);
+            return response;
+        }
+
+        private void HandleLoginResponse(IAuthenticationType authenticationType, AuthenticationResponse response)
+        {
+            if (!response.Success)
+            {
+                Deauthenticate();
+                return;
+            }
+
+            User = response.User;
+            _cachingService.CacheSessionToken(User.SessionId);
+            SendAnalytics(authenticationType, User);
+        }
+
+        public bool CloudAuthenticationAvailable(out string username, out string cloudToken)
+        {
+            username = CloudProjectSettings.userName;
+            cloudToken = CloudProjectSettings.accessToken;
+            return !username.Equals("anonymous");
+        }
+
+        public void Deauthenticate()
+        {
+            _api.Deauthenticate();
+
+            User = null;
+            _cachingService.ClearCachedSessionToken();
+        }
+
+        private void SendAnalytics(IAuthenticationType authenticationType, User user)
+        {
+            try
+            {
+                // Do not send session authentication events
+                if (authenticationType is SessionAuthentication)
+                    return;
+
+                var analytic = new AuthenticationAnalytic(authenticationType, user.PublisherId);
+                var result = _analyticsService.Send(analytic);
+            }
+            catch (Exception e) { ASDebug.LogError($"Could not send analytics: {e}"); }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/AuthenticationService.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/AuthenticationService.cs.meta
new file mode 100644
index 0000000..8aa4983
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/AuthenticationService.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: c1c3d6578d298d049a8dcf858fd3686e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/AuthenticationService.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/IAuthenticationService.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/IAuthenticationService.cs
new file mode 100644
index 0000000..25921d9
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/IAuthenticationService.cs
@@ -0,0 +1,16 @@
+using AssetStoreTools.Api.Models;
+using AssetStoreTools.Api.Responses;
+using System.Threading.Tasks;
+
+namespace AssetStoreTools.Uploader.Services.Api
+{
+    internal interface IAuthenticationService : IUploaderService
+    {
+        User User { get; }
+        Task<AuthenticationResponse> AuthenticateWithCredentials(string email, string password);
+        Task<AuthenticationResponse> AuthenticateWithSessionToken();
+        Task<AuthenticationResponse> AuthenticateWithCloudToken();
+        bool CloudAuthenticationAvailable(out string username, out string cloudToken);
+        void Deauthenticate();
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/IAuthenticationService.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/IAuthenticationService.cs.meta
new file mode 100644
index 0000000..ecf573f
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/IAuthenticationService.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: ff0518dc0d95d3540857d138215bb900
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/IAuthenticationService.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/IPackageDownloadingService.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/IPackageDownloadingService.cs
new file mode 100644
index 0000000..297ca95
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/IPackageDownloadingService.cs
@@ -0,0 +1,16 @@
+using AssetStoreTools.Api.Responses;
+using AssetStoreTools.Uploader.Data;
+using System.Threading.Tasks;
+
+namespace AssetStoreTools.Uploader.Services.Api
+{
+    internal interface IPackageDownloadingService : IUploaderService
+    {
+        Task<PackagesDataResponse> GetPackageData();
+        Task<RefreshedPackageDataResponse> UpdatePackageData(IPackage package);
+        void ClearPackageData();
+        Task<PackageThumbnailResponse> GetPackageThumbnail(IPackage package);
+        Task<PackageUploadedUnityVersionDataResponse> GetPackageUploadedVersions(IPackage package, int timeoutMs);
+        void StopDownloading();
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/IPackageDownloadingService.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/IPackageDownloadingService.cs.meta
new file mode 100644
index 0000000..0471c59
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/IPackageDownloadingService.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 96acd12a628311d429cc285f418f8b90
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/IPackageDownloadingService.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/IPackageUploadingService.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/IPackageUploadingService.cs
new file mode 100644
index 0000000..7e68386
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/IPackageUploadingService.cs
@@ -0,0 +1,16 @@
+using AssetStoreTools.Api;
+using AssetStoreTools.Api.Responses;
+using System;
+using System.Threading.Tasks;
+
+namespace AssetStoreTools.Uploader.Services.Api
+{
+    internal interface IPackageUploadingService : IUploaderService
+    {
+        bool IsUploading { get; }
+
+        Task<PackageUploadResponse> UploadPackage(IPackageUploader uploader, IProgress<float> progress);
+        void StopUploading(IPackageUploader package);
+        void StopAllUploadinng();
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/IPackageUploadingService.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/IPackageUploadingService.cs.meta
new file mode 100644
index 0000000..b3fd437
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/IPackageUploadingService.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 9a3d78f3bc68d3d44b4300bc8ffe69c2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/IPackageUploadingService.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/PackageDownloadingService.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/PackageDownloadingService.cs
new file mode 100644
index 0000000..d1ea82b
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/PackageDownloadingService.cs
@@ -0,0 +1,109 @@
+using AssetStoreTools.Api;
+using AssetStoreTools.Api.Responses;
+using AssetStoreTools.Uploader.Data;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace AssetStoreTools.Uploader.Services.Api
+{
+    internal class PackageDownloadingService : IPackageDownloadingService
+    {
+        public const int MaxConcurrentTumbnailDownloads = 10;
+
+        private IAssetStoreApi _api;
+        private ICachingService _cachingService;
+
+        private int _currentDownloads;
+        private CancellationTokenSource _cancellationTokenSource;
+
+        public PackageDownloadingService(IAssetStoreApi api, ICachingService cachingService)
+        {
+            _api = api;
+            _cachingService = cachingService;
+            _cancellationTokenSource = new CancellationTokenSource();
+        }
+
+        public void ClearPackageData()
+        {
+            _cachingService.DeletePackageMetadata();
+        }
+
+        public async Task<PackagesDataResponse> GetPackageData()
+        {
+            if (!_cachingService.GetCachedPackageMetadata(out var models))
+            {
+                var cancellationToken = _cancellationTokenSource.Token;
+                var packagesResponse = await _api.GetPackages(cancellationToken);
+
+                if (packagesResponse.Cancelled || !packagesResponse.Success)
+                    return packagesResponse;
+
+                _cachingService.CachePackageMetadata(packagesResponse.Packages);
+                return packagesResponse;
+            }
+
+            return new PackagesDataResponse() { Success = true, Packages = models };
+        }
+
+        public async Task<RefreshedPackageDataResponse> UpdatePackageData(IPackage package)
+        {
+            var response = await _api.RefreshPackageMetadata(package.ToModel());
+
+            if (response.Success)
+                _cachingService.UpdatePackageMetadata(response.Package);
+
+            return response;
+        }
+
+        public async Task<PackageThumbnailResponse> GetPackageThumbnail(IPackage package)
+        {
+            if (_cachingService.GetCachedPackageThumbnail(package.PackageId, out var cachedTexture))
+            {
+                return new PackageThumbnailResponse() { Success = true, Thumbnail = cachedTexture };
+            }
+
+            var cancellationToken = _cancellationTokenSource.Token;
+            while (_currentDownloads >= MaxConcurrentTumbnailDownloads)
+                await Task.Delay(100);
+
+            if (cancellationToken.IsCancellationRequested)
+                return new PackageThumbnailResponse() { Success = false, Cancelled = true };
+
+            _currentDownloads++;
+            var result = await _api.GetPackageThumbnail(package.ToModel(), cancellationToken);
+            _currentDownloads--;
+
+            if (result.Success && result.Thumbnail != null)
+                _cachingService.CachePackageThumbnail(package.PackageId, result.Thumbnail);
+
+            return result;
+        }
+
+        public async Task<PackageUploadedUnityVersionDataResponse> GetPackageUploadedVersions(IPackage package, int timeoutMs)
+        {
+            var timeoutTokenSource = new CancellationTokenSource();
+            try
+            {
+                var versionsTask = _api.GetPackageUploadedVersions(package.ToModel(), timeoutTokenSource.Token);
+
+                // Wait for versions to be retrieved, or a timeout to occur, whichever is first
+                if (await Task.WhenAny(versionsTask, Task.Delay(timeoutMs)) != versionsTask)
+                {
+                    timeoutTokenSource.Cancel();
+                }
+
+                return await versionsTask;
+            }
+            finally
+            {
+                timeoutTokenSource.Dispose();
+            }
+        }
+
+        public void StopDownloading()
+        {
+            _cancellationTokenSource.Cancel();
+            _cancellationTokenSource = new CancellationTokenSource();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/PackageDownloadingService.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/PackageDownloadingService.cs.meta
new file mode 100644
index 0000000..7ff441d
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/PackageDownloadingService.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: adc44e974cb91b54fac3819284b7ba82
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/PackageDownloadingService.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/PackageUploadingService.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/PackageUploadingService.cs
new file mode 100644
index 0000000..d133cbd
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/PackageUploadingService.cs
@@ -0,0 +1,103 @@
+using AssetStoreTools.Api;
+using AssetStoreTools.Api.Responses;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using UnityEditor;
+
+namespace AssetStoreTools.Uploader.Services.Api
+{
+    internal class PackageUploadingService : IPackageUploadingService
+    {
+        private class UploadInProgress
+        {
+            public IPackageUploader Uploader;
+            public IProgress<float> Progress = new Progress<float>();
+            public CancellationTokenSource CancellationTokenSource = new CancellationTokenSource();
+
+            public UploadInProgress(IPackageUploader uploader, IProgress<float> progress)
+            {
+                Uploader = uploader;
+                Progress = progress;
+                CancellationTokenSource = new CancellationTokenSource();
+            }
+        }
+
+        private IAssetStoreApi _api;
+        private List<UploadInProgress> _uploadsInProgress;
+
+        public bool IsUploading => _uploadsInProgress.Count > 0;
+
+        public PackageUploadingService(IAssetStoreApi api)
+        {
+            _api = api;
+            _uploadsInProgress = new List<UploadInProgress>();
+        }
+
+        public async Task<PackageUploadResponse> UploadPackage(IPackageUploader uploader, IProgress<float> progress)
+        {
+            using (var cancellationTokenSource = new CancellationTokenSource())
+            {
+                var uploadInProgress = StartTrackingUpload(uploader, progress);
+                var response = await _api.UploadPackage(uploadInProgress.Uploader, uploadInProgress.Progress, uploadInProgress.CancellationTokenSource.Token);
+                StopTrackingUpload(uploadInProgress);
+
+                return response;
+            }
+        }
+
+        private UploadInProgress StartTrackingUpload(IPackageUploader uploader, IProgress<float> progress)
+        {
+            // If this is the first upload - lock reload assemblies and prevent entering play mode
+            if (_uploadsInProgress.Count == 0)
+            {
+                EditorApplication.LockReloadAssemblies();
+                EditorApplication.playModeStateChanged += PreventEnteringPlayMode;
+            }
+
+            var uploadInProgress = new UploadInProgress(uploader, progress);
+            _uploadsInProgress.Add(uploadInProgress);
+
+            return uploadInProgress;
+        }
+
+        private void StopTrackingUpload(UploadInProgress uploadInProgress)
+        {
+            _uploadsInProgress.Remove(uploadInProgress);
+
+            // If this was the last upload - unlock reload assemblies and allow entering play mode
+            if (_uploadsInProgress.Count > 0)
+                return;
+
+            EditorApplication.UnlockReloadAssemblies();
+            EditorApplication.playModeStateChanged -= PreventEnteringPlayMode;
+        }
+
+        private void PreventEnteringPlayMode(PlayModeStateChange change)
+        {
+            if (change != PlayModeStateChange.ExitingEditMode)
+                return;
+
+            EditorApplication.ExitPlaymode();
+            EditorUtility.DisplayDialog("Notice", "Entering Play Mode is not allowed while there's a package upload in progress.\n\n" +
+                                                  "Please wait until the upload is finished or cancel the upload from the Asset Store Uploader window", "OK");
+        }
+
+        public void StopUploading(IPackageUploader uploader)
+        {
+            var uploadInProgress = _uploadsInProgress.FirstOrDefault(x => x.Uploader == uploader);
+            if (uploadInProgress == null)
+                return;
+
+            uploadInProgress.CancellationTokenSource.Cancel();
+        }
+
+        public void StopAllUploadinng()
+        {
+            foreach (var uploadInProgress in _uploadsInProgress)
+                uploadInProgress.CancellationTokenSource.Cancel();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/PackageUploadingService.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/PackageUploadingService.cs.meta
new file mode 100644
index 0000000..54f5def
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/PackageUploadingService.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 22e23997fe339a74bb5355d6a88ce731
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Api/PackageUploadingService.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Caching.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Caching.meta
new file mode 100644
index 0000000..7267ddb
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Caching.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a834946d92154754493879c5fcc7dbc9
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Caching/CachingService.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Caching/CachingService.cs
new file mode 100644
index 0000000..c2a48f7
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Caching/CachingService.cs
@@ -0,0 +1,157 @@
+using AssetStoreTools.Api.Models;
+using AssetStoreTools.Uploader.Data.Serialization;
+using AssetStoreTools.Utility;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Uploader.Services
+{
+    internal class CachingService : ICachingService
+    {
+        private VisualElement _cachedUploaderWindow;
+
+        public bool GetCachedUploaderWindow(out VisualElement uploaderWindow)
+        {
+            uploaderWindow = _cachedUploaderWindow;
+            return uploaderWindow != null;
+        }
+
+        public void CacheUploaderWindow(VisualElement uploaderWindow)
+        {
+            _cachedUploaderWindow = uploaderWindow;
+        }
+
+        public void CacheSessionToken(string sessionToken)
+        {
+            if (string.IsNullOrEmpty(sessionToken))
+                throw new ArgumentException("Session token cannot be null");
+
+            EditorPrefs.SetString(Constants.Cache.SessionTokenKey, sessionToken);
+        }
+
+        public bool GetCachedSessionToken(out string sessionToken)
+        {
+            sessionToken = EditorPrefs.GetString(Constants.Cache.SessionTokenKey, string.Empty);
+            return !string.IsNullOrEmpty(sessionToken);
+        }
+
+        public void ClearCachedSessionToken()
+        {
+            EditorPrefs.DeleteKey(Constants.Cache.SessionTokenKey);
+        }
+
+        public bool GetCachedPackageMetadata(out List<Package> data)
+        {
+            data = new List<Package>();
+            if (!CacheUtil.GetFileFromTempCache(Constants.Cache.PackageDataFileName, out var filePath))
+                return false;
+
+            try
+            {
+                var serializerSettings = new JsonSerializerSettings()
+                {
+                    ContractResolver = Package.CachedPackageResolver.Instance
+                };
+
+                data = JsonConvert.DeserializeObject<List<Package>>(File.ReadAllText(filePath, Encoding.UTF8), serializerSettings);
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        public void CachePackageMetadata(List<Package> data)
+        {
+            if (data == null)
+                throw new ArgumentException("Package data cannot be null");
+
+            var serializerSettings = new JsonSerializerSettings()
+            {
+                ContractResolver = Package.CachedPackageResolver.Instance,
+                Formatting = Formatting.Indented
+            };
+
+            CacheUtil.CreateFileInTempCache(Constants.Cache.PackageDataFileName, JsonConvert.SerializeObject(data, serializerSettings), true);
+        }
+
+        public void DeletePackageMetadata()
+        {
+            CacheUtil.DeleteFileFromTempCache(Constants.Cache.PackageDataFileName);
+        }
+
+        public void UpdatePackageMetadata(Package data)
+        {
+            if (!GetCachedPackageMetadata(out var cachedData))
+                return;
+
+            var index = cachedData.FindIndex(x => x.PackageId.Equals(data.PackageId));
+            if (index == -1)
+            {
+                cachedData.Add(data);
+            }
+            else
+            {
+                cachedData.RemoveAt(index);
+                cachedData.Insert(index, data);
+            }
+
+            CachePackageMetadata(cachedData);
+        }
+
+        public bool GetCachedPackageThumbnail(string packageId, out Texture2D texture)
+        {
+            texture = null;
+            if (!CacheUtil.GetFileFromTempCache(Constants.Cache.PackageThumbnailFileName(packageId), out var filePath))
+                return false;
+
+            texture = new Texture2D(1, 1);
+            texture.LoadImage(File.ReadAllBytes(filePath));
+            return true;
+        }
+
+        public void CachePackageThumbnail(string packageId, Texture2D texture)
+        {
+            CacheUtil.CreateFileInTempCache(Constants.Cache.PackageThumbnailFileName(packageId), texture.EncodeToPNG(), true);
+        }
+
+        public bool GetCachedWorkflowStateData(string packageId, out WorkflowStateData data)
+        {
+            data = null;
+
+            if (string.IsNullOrEmpty(packageId))
+                return false;
+
+            if (!CacheUtil.GetFileFromPersistentCache(Constants.Cache.WorkflowStateDataFileName(packageId), out var filePath))
+                return false;
+
+            try
+            {
+                data = JsonConvert.DeserializeObject<WorkflowStateData>(File.ReadAllText(filePath, Encoding.UTF8));
+                if (string.IsNullOrEmpty(data.GetPackageId()))
+                    return false;
+            }
+            catch
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        public void CacheWorkflowStateData(WorkflowStateData data)
+        {
+            if (data == null)
+                throw new ArgumentException("Workflow state data cannot be null");
+
+            CacheUtil.CreateFileInPersistentCache(Constants.Cache.WorkflowStateDataFileName(data.GetPackageId()), JsonConvert.SerializeObject(data, Formatting.Indented), true);
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Caching/CachingService.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Caching/CachingService.cs.meta
new file mode 100644
index 0000000..0999689
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Caching/CachingService.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: fffaed09a3f76f945a7ececfb355f3e0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Caching/CachingService.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Caching/ICachingService.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Caching/ICachingService.cs
new file mode 100644
index 0000000..178d88c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Caching/ICachingService.cs
@@ -0,0 +1,25 @@
+using AssetStoreTools.Api.Models;
+using AssetStoreTools.Uploader.Data.Serialization;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Uploader.Services
+{
+    internal interface ICachingService : IUploaderService
+    {
+        void CacheUploaderWindow(VisualElement uploaderWindow);
+        bool GetCachedUploaderWindow(out VisualElement uploaderWindow);
+        void CacheSessionToken(string sessionToken);
+        bool GetCachedSessionToken(out string sessionToken);
+        void ClearCachedSessionToken();
+        bool GetCachedPackageMetadata(out List<Package> data);
+        void UpdatePackageMetadata(Package data);
+        void CachePackageMetadata(List<Package> data);
+        void DeletePackageMetadata();
+        bool GetCachedPackageThumbnail(string packageId, out Texture2D texture);
+        void CachePackageThumbnail(string packageId, Texture2D texture);
+        bool GetCachedWorkflowStateData(string packageId, out WorkflowStateData data);
+        void CacheWorkflowStateData(WorkflowStateData data);
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Caching/ICachingService.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Caching/ICachingService.cs.meta
new file mode 100644
index 0000000..2af6a1d
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Caching/ICachingService.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: a904477679e07bc4889bc15e894c0c48
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/Caching/ICachingService.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/IUploaderService.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/IUploaderService.cs
new file mode 100644
index 0000000..34a1db9
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/IUploaderService.cs
@@ -0,0 +1,4 @@
+namespace AssetStoreTools.Uploader.Services
+{
+    internal interface IUploaderService { }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/IUploaderService.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/IUploaderService.cs.meta
new file mode 100644
index 0000000..ee2c2d3
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/IUploaderService.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 757d7a4dc29863740859c936be514fea
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/IUploaderService.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/PackageFactory.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/PackageFactory.meta
new file mode 100644
index 0000000..cb9e723
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/PackageFactory.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 02e4a5ee9e2fb7941b876b207078e01d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/PackageFactory/IPackageFactoryService.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/PackageFactory/IPackageFactoryService.cs
new file mode 100644
index 0000000..41c1b44
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/PackageFactory/IPackageFactoryService.cs
@@ -0,0 +1,18 @@
+using AssetStoreTools.Uploader.Data;
+using AssetStoreTools.Uploader.Data.Serialization;
+using System.Collections.Generic;
+using PackageModel = AssetStoreTools.Api.Models.Package;
+
+namespace AssetStoreTools.Uploader.Services
+{
+    internal interface IPackageFactoryService : IUploaderService
+    {
+        IPackageGroup CreatePackageGroup(string groupName, List<IPackage> packages);
+        IPackage CreatePackage(PackageModel packageModel);
+        IPackageContent CreatePackageContent(IPackage package);
+        List<IWorkflow> CreateWorkflows(IPackage package, WorkflowStateData stateData);
+        AssetsWorkflow CreateAssetsWorkflow(IPackage package, AssetsWorkflowState stateData);
+        UnityPackageWorkflow CreateUnityPackageWorkflow(IPackage package, UnityPackageWorkflowState stateData);
+        HybridPackageWorkflow CreateHybridPackageWorkflow(IPackage package, HybridPackageWorkflowState stateData);
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/PackageFactory/IPackageFactoryService.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/PackageFactory/IPackageFactoryService.cs.meta
new file mode 100644
index 0000000..e108450
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/PackageFactory/IPackageFactoryService.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 14324b71768a1ea499baa06de33f05af
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/PackageFactory/IPackageFactoryService.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/PackageFactory/PackageFactoryService.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/PackageFactory/PackageFactoryService.cs
new file mode 100644
index 0000000..f451384
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/PackageFactory/PackageFactoryService.cs
@@ -0,0 +1,95 @@
+using AssetStoreTools.Uploader.Data;
+using AssetStoreTools.Uploader.Data.Serialization;
+using AssetStoreTools.Uploader.Services.Analytics;
+using AssetStoreTools.Uploader.Services.Api;
+using System.Collections.Generic;
+using PackageModel = AssetStoreTools.Api.Models.Package;
+
+namespace AssetStoreTools.Uploader.Services
+{
+    internal class PackageFactoryService : IPackageFactoryService
+    {
+        private IWorkflowServices _workflowServices;
+
+        // Service dependencies
+        private ICachingService _cachingService;
+        private IPackageDownloadingService _packageDownloadingService;
+        private IPackageUploadingService _packageUploadingService;
+        private IAnalyticsService _analyticsService;
+
+        public PackageFactoryService(
+            ICachingService cachingService,
+            IPackageDownloadingService packageDownloadingService,
+            IPackageUploadingService packageUploadingService,
+            IAnalyticsService analyticsService
+            )
+        {
+            _cachingService = cachingService;
+            _packageDownloadingService = packageDownloadingService;
+            _packageUploadingService = packageUploadingService;
+            _analyticsService = analyticsService;
+
+            _workflowServices = new WorkflowServices(_packageDownloadingService, _packageUploadingService, _analyticsService);
+        }
+
+        public IPackage CreatePackage(PackageModel packageModel)
+        {
+            var package = new Package(packageModel);
+            return package;
+        }
+
+        public IPackageGroup CreatePackageGroup(string groupName, List<IPackage> packages)
+        {
+            return new PackageGroup(groupName, packages);
+        }
+
+        public IPackageContent CreatePackageContent(IPackage package)
+        {
+            if (!package.IsDraft)
+                return null;
+
+            WorkflowStateData stateData = GetOrCreateWorkflowStateData(package);
+
+            var workflows = CreateWorkflows(package, stateData);
+            var packageContent = new PackageContent(workflows, stateData, _cachingService);
+            return packageContent;
+        }
+
+        public List<IWorkflow> CreateWorkflows(IPackage package, WorkflowStateData stateData)
+        {
+            var workflows = new List<IWorkflow>
+            {
+                CreateAssetsWorkflow(package, stateData.GetAssetsWorkflowState()),
+                CreateUnityPackageWorkflow(package, stateData.GetUnityPackageWorkflowState()),
+#if UNITY_ASTOOLS_EXPERIMENTAL
+                CreateHybridPackageWorkflow(package, stateData.GetHybridPackageWorkflowState()),
+#endif
+            };
+
+            return workflows;
+        }
+
+        public AssetsWorkflow CreateAssetsWorkflow(IPackage package, AssetsWorkflowState stateData)
+        {
+            return new AssetsWorkflow(package, stateData, _workflowServices);
+        }
+
+        public UnityPackageWorkflow CreateUnityPackageWorkflow(IPackage package, UnityPackageWorkflowState stateData)
+        {
+            return new UnityPackageWorkflow(package, stateData, _workflowServices);
+        }
+
+        public HybridPackageWorkflow CreateHybridPackageWorkflow(IPackage package, HybridPackageWorkflowState stateData)
+        {
+            return new HybridPackageWorkflow(package, stateData, _workflowServices);
+        }
+
+        private WorkflowStateData GetOrCreateWorkflowStateData(IPackage package)
+        {
+            if (!_cachingService.GetCachedWorkflowStateData(package.PackageId, out var stateData))
+                stateData = new WorkflowStateData(package.PackageId);
+
+            return stateData;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/PackageFactory/PackageFactoryService.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/PackageFactory/PackageFactoryService.cs.meta
new file mode 100644
index 0000000..86dfc2c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/PackageFactory/PackageFactoryService.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 4074a5b21b6201d449974dcfb652a00b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/PackageFactory/PackageFactoryService.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/UploaderServiceProvider.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/UploaderServiceProvider.cs
new file mode 100644
index 0000000..542db82
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/UploaderServiceProvider.cs
@@ -0,0 +1,26 @@
+using AssetStoreTools.Api;
+using AssetStoreTools.Uploader.Services.Analytics;
+using AssetStoreTools.Uploader.Services.Api;
+using AssetStoreTools.Utility;
+
+namespace AssetStoreTools.Uploader.Services
+{
+    internal class UploaderServiceProvider : ServiceProvider<IUploaderService>
+    {
+        public static UploaderServiceProvider Instance => _instance ?? (_instance = new UploaderServiceProvider());
+        private static UploaderServiceProvider _instance;
+
+        private UploaderServiceProvider() { }
+
+        protected override void RegisterServices()
+        {
+            var api = new AssetStoreApi(new AssetStoreClient());
+            Register<IAnalyticsService, AnalyticsService>();
+            Register<ICachingService, CachingService>();
+            Register<IAuthenticationService>(() => new AuthenticationService(api, GetService<ICachingService>(), GetService<IAnalyticsService>()));
+            Register<IPackageDownloadingService>(() => new PackageDownloadingService(api, GetService<ICachingService>()));
+            Register<IPackageUploadingService>(() => new PackageUploadingService(api));
+            Register<IPackageFactoryService, PackageFactoryService>();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/UploaderServiceProvider.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/UploaderServiceProvider.cs.meta
new file mode 100644
index 0000000..298a1cf
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/UploaderServiceProvider.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: e66f9c7f198baff41ba77f4d0ed7b60f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/Services/UploaderServiceProvider.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI.meta
new file mode 100644
index 0000000..e39a22f
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ed759a6e886dbfd4fbcecc2beb7248b8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements.meta
new file mode 100644
index 0000000..497fc1d
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d14df9cf4e7e9b54c8c94a8cc1aa70c0
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/Abstractions.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/Abstractions.meta
new file mode 100644
index 0000000..9ec9955
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/Abstractions.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 144a518ff26df1e41845217c0f0002d7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/Abstractions/ValidationElementBase.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/Abstractions/ValidationElementBase.cs
new file mode 100644
index 0000000..8757c1a
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/Abstractions/ValidationElementBase.cs
@@ -0,0 +1,170 @@
+using AssetStoreTools.Uploader.Data;
+using AssetStoreTools.Validator.Data;
+using System.Linq;
+using UnityEditor;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Uploader.UI.Elements
+{
+    internal abstract class ValidationElementBase : VisualElement
+    {
+        // Data
+        protected IWorkflow Workflow;
+
+        // UI
+        protected VisualElement ResultsBox;
+        protected Image ResultsBoxImage;
+        protected Label ResultsBoxLabel;
+
+        protected ValidationElementBase(IWorkflow workflow)
+        {
+            Workflow = workflow;
+            Create();
+        }
+
+        private void Create()
+        {
+            CreateInfoRow();
+            CreateResultsBox();
+        }
+
+        private void CreateInfoRow()
+        {
+            VisualElement validatorButtonRow = new VisualElement();
+            validatorButtonRow.AddToClassList("package-content-option-box");
+
+            VisualElement validatorLabelHelpRow = new VisualElement();
+            validatorLabelHelpRow.AddToClassList("package-content-option-label-help-row");
+
+            Label validatorLabel = new Label { text = "Validation" };
+            Image validatorLabelTooltip = new Image
+            {
+                tooltip = "You can use the Asset Store Validator to check your package for common publishing issues"
+            };
+
+            var validateButton = new Button(Validate) { name = "ValidateButton", text = "Validate" };
+
+            validatorLabelHelpRow.Add(validatorLabel);
+            validatorLabelHelpRow.Add(validatorLabelTooltip);
+
+            validatorButtonRow.Add(validatorLabelHelpRow);
+            validatorButtonRow.Add(validateButton);
+
+            Add(validatorButtonRow);
+        }
+
+        private void CreateResultsBox()
+        {
+            ResultsBox = new Box { name = "InfoBox" };
+            ResultsBox.style.display = DisplayStyle.None;
+            ResultsBox.AddToClassList("validation-result-box");
+
+            ResultsBoxImage = new Image();
+            ResultsBoxLabel = new Label { name = "ValidationLabel" };
+
+            ResultsBox.Add(ResultsBoxImage);
+            ResultsBox.Add(ResultsBoxLabel);
+
+            Add(ResultsBox);
+        }
+
+        protected virtual bool ConfirmValidation()
+        {
+            // Child classes can implement pre-validation prompts
+            return true;
+        }
+
+        private void Validate()
+        {
+            if (!ConfirmValidation())
+                return;
+
+            var validationResult = Workflow.Validate();
+
+            if (validationResult.Status == ValidationStatus.Cancelled)
+                return;
+
+            if (validationResult.Status != ValidationStatus.RanToCompletion)
+            {
+                EditorUtility.DisplayDialog("Validation failed", $"Package validation failed: {validationResult.Exception.Message}", "OK");
+                return;
+            }
+
+            DisplayResult(validationResult);
+        }
+
+        private void DisplayResult(ValidationResult result)
+        {
+            ResultsBox.style.display = DisplayStyle.Flex;
+            UpdateValidationResultImage(result);
+            UpdateValidationResultLabel(result);
+        }
+
+        public void HideResult()
+        {
+            ResultsBox.style.display = DisplayStyle.None;
+        }
+
+        protected void UpdateValidationResultImage(ValidationResult result)
+        {
+            switch (GetValidationSummaryStatus(result))
+            {
+                case TestResultStatus.Pass:
+                    ResultsBoxImage.image = EditorGUIUtility.IconContent("console.infoicon@2x").image;
+                    break;
+                case TestResultStatus.Warning:
+                    ResultsBoxImage.image = EditorGUIUtility.IconContent("console.warnicon@2x").image;
+                    break;
+                case TestResultStatus.Fail:
+                    ResultsBoxImage.image = EditorGUIUtility.IconContent("console.erroricon@2x").image;
+                    break;
+                default:
+                    ResultsBoxImage.image = EditorGUIUtility.IconContent("_Help@2x").image;
+                    break;
+            }
+        }
+
+        private void UpdateValidationResultLabel(ValidationResult result)
+        {
+            var errorCount = result.Tests.Where(x => x.Result.Status == TestResultStatus.Fail).Count();
+            var warningCount = result.Tests.Where(x => x.Result.Status == TestResultStatus.Warning).Count();
+
+            string text = string.Empty;
+            if (result.HadCompilationErrors)
+            {
+                text += "- Package caused compilation errors\n";
+            }
+            if (errorCount > 0)
+            {
+                text += $"- Validation reported {errorCount} error(s)\n";
+            }
+            if (warningCount > 0)
+            {
+                text += $"- Validation reported {warningCount} warning(s)\n";
+            }
+
+            if (string.IsNullOrEmpty(text))
+            {
+                text = "No issues were found!";
+            }
+            else
+            {
+                text = text.Substring(0, text.Length - "\n".Length);
+            }
+
+            ResultsBoxLabel.text = text;
+        }
+
+        private TestResultStatus GetValidationSummaryStatus(ValidationResult result)
+        {
+            if (result.HadCompilationErrors ||
+                result.Tests.Any(x => x.Result.Status == TestResultStatus.Fail))
+                return TestResultStatus.Fail;
+
+            if (result.Tests.Any(x => x.Result.Status == TestResultStatus.Warning))
+                return TestResultStatus.Warning;
+
+            return TestResultStatus.Pass;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/Abstractions/ValidationElementBase.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/Abstractions/ValidationElementBase.cs.meta
new file mode 100644
index 0000000..d8cbc88
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/Abstractions/ValidationElementBase.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: cb20404763eac7144b562c18ad1c37fe
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/Abstractions/ValidationElementBase.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/Abstractions/WorkflowElementBase.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/Abstractions/WorkflowElementBase.cs
new file mode 100644
index 0000000..a3ed09b
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/Abstractions/WorkflowElementBase.cs
@@ -0,0 +1,151 @@
+using AssetStoreTools.Uploader.Data;
+using AssetStoreTools.Utility;
+using System;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Uploader.UI.Elements
+{
+    internal abstract class WorkflowElementBase : VisualElement
+    {
+        // Data
+        protected IWorkflow Workflow;
+        public string Name => Workflow.Name;
+        public string DisplayName => Workflow.DisplayName;
+
+        // UI Elements that all workflows have
+        protected PathSelectionElement PathSelectionElement;
+        protected PreviewGenerationElement PreviewGenerationElement;
+        protected ValidationElementBase ValidationElement;
+        protected PackageUploadElement UploadElement;
+
+        public event Action OnInteractionAvailable;
+        public event Action OnInteractionUnavailable;
+
+        public WorkflowElementBase(IWorkflow workflow)
+        {
+            Workflow = workflow;
+        }
+
+        protected void CreatePathElement(string labelText, string labelTooltip)
+        {
+            PathSelectionElement = new PathSelectionElement(labelText, labelTooltip);
+            PathSelectionElement.OnBrowse += BrowsePath;
+            Add(PathSelectionElement);
+        }
+
+        protected void CreatePreviewGenerationElement()
+        {
+            PreviewGenerationElement = new PreviewGenerationElement(Workflow);
+            PreviewGenerationElement.style.display = DisplayStyle.None;
+            var callback = new Action(() =>
+                PreviewGenerationElement.style.display = ASToolsPreferences.Instance.UseLegacyExporting
+                ? DisplayStyle.None
+                : DisplayStyle.Flex);
+            RegisterCallback<AttachToPanelEvent>((_) => { ASToolsPreferences.OnSettingsChange += callback; });
+            RegisterCallback<DetachFromPanelEvent>((_) => { ASToolsPreferences.OnSettingsChange -= callback; });
+            Add(PreviewGenerationElement);
+        }
+
+        protected void CreateValidationElement(ValidationElementBase validationElement)
+        {
+            ValidationElement = validationElement;
+            ValidationElement.style.display = DisplayStyle.None;
+            Add(ValidationElement);
+        }
+
+        protected void CreateUploadElement(IWorkflow workflow, bool exposeExportButton)
+        {
+            UploadElement = new PackageUploadElement(workflow, exposeExportButton);
+            UploadElement.OnInteractionAvailable += EnableInteraction;
+            UploadElement.OnInteractionUnavailable += DisableInteraction;
+            UploadElement.style.display = DisplayStyle.None;
+            Add(UploadElement);
+        }
+
+        protected abstract void BrowsePath();
+
+        protected void SetPathSelectionTextField(string value)
+        {
+            if (string.IsNullOrEmpty(value))
+                return;
+
+            PathSelectionElement.SetPath(value);
+            ValidationElement.style.display = DisplayStyle.Flex;
+            UploadElement.style.display = DisplayStyle.Flex;
+
+            if (PreviewGenerationElement != null && !ASToolsPreferences.Instance.UseLegacyExporting)
+            {
+                PreviewGenerationElement.style.display = DisplayStyle.Flex;
+            }
+        }
+
+        protected void CheckForMissingMetas(IEnumerable<string> paths)
+        {
+            bool displayDialog = ASToolsPreferences.Instance.DisplayHiddenMetaDialog && FileUtility.IsMissingMetaFiles(paths);
+            if (!displayDialog)
+                return;
+
+            var selectedOption = EditorUtility.DisplayDialogComplex(
+                    "Notice",
+                    "Your package includes hidden folders which do not contain meta files. " +
+                    "Hidden folders will not be exported unless they contain meta files.\n\nWould you like meta files to be generated?",
+                    "Yes", "No", "No and do not display this again");
+
+            switch (selectedOption)
+            {
+                case 0:
+                    try
+                    {
+                        FileUtility.GenerateMetaFiles(paths);
+                        EditorUtility.DisplayDialog(
+                            "Success",
+                            "Meta files have been generated. Please note that further manual tweaking may be required to set up correct references",
+                            "OK");
+                    }
+                    catch (Exception e)
+                    {
+                        EditorUtility.DisplayDialog(
+                            "Error",
+                            $"Meta file generation failed: {e.Message}",
+                            "OK"
+                            );
+                    }
+                    break;
+                case 1:
+                    // Do nothing
+                    return;
+                case 2:
+                    ASToolsPreferences.Instance.DisplayHiddenMetaDialog = false;
+                    ASToolsPreferences.Instance.Save();
+                    return;
+            }
+        }
+
+        public bool Is(IWorkflow workflow)
+        {
+            return Workflow == workflow;
+        }
+
+        protected virtual void EnableInteraction()
+        {
+            PathSelectionElement.SetEnabled(true);
+            ValidationElement.SetEnabled(true);
+            PreviewGenerationElement?.SetEnabled(true);
+            UploadElement.SetEnabled(true);
+            OnInteractionAvailable?.Invoke();
+        }
+
+        protected virtual void DisableInteraction()
+        {
+            PathSelectionElement.SetEnabled(false);
+            ValidationElement.SetEnabled(false);
+            PreviewGenerationElement?.SetEnabled(false);
+            UploadElement.SetEnabled(false);
+            OnInteractionUnavailable?.Invoke();
+        }
+
+        protected abstract void Deserialize();
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/Abstractions/WorkflowElementBase.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/Abstractions/WorkflowElementBase.cs.meta
new file mode 100644
index 0000000..60d00d4
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/Abstractions/WorkflowElementBase.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 45d1bf267c3ea9048bfdd75d0d19c8bd
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/Abstractions/WorkflowElementBase.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/AccountToolbar.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/AccountToolbar.cs
new file mode 100644
index 0000000..9485f35
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/AccountToolbar.cs
@@ -0,0 +1,102 @@
+using AssetStoreTools.Api.Models;
+using System;
+using System.Threading.Tasks;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Uploader.UI.Elements
+{
+    internal class AccountToolbar : VisualElement
+    {
+        private Image _accountImage;
+        private Label _accountEmailLabel;
+        private Button _refreshButton;
+
+        public event Func<Task> OnRefresh;
+        public event Action OnLogout;
+
+        public AccountToolbar()
+        {
+            Create();
+        }
+
+        private void Create()
+        {
+            AddToClassList("account-toolbar");
+
+            // Left side of the toolbar
+            VisualElement leftSideContainer = new VisualElement { name = "LeftSideContainer" };
+            leftSideContainer.AddToClassList("account-toolbar-left-side-container");
+
+            _accountImage = new Image();
+            _accountImage.AddToClassList("account-toolbar-user-image");
+
+            _accountEmailLabel = new Label() { name = "AccountEmail" };
+            _accountEmailLabel.AddToClassList("account-toolbar-email-label");
+
+            leftSideContainer.Add(_accountImage);
+            leftSideContainer.Add(_accountEmailLabel);
+
+            // Right side of the toolbar
+            VisualElement rightSideContainer = new VisualElement { name = "RightSideContainer" };
+            rightSideContainer.AddToClassList("account-toolbar-right-side-container");
+
+            // Refresh button
+            _refreshButton = new Button(Refresh) { name = "RefreshButton", text = "Refresh" };
+            _refreshButton.AddToClassList("account-toolbar-button-refresh");
+
+            // Logout button
+            var logoutButton = new Button(Logout) { name = "LogoutButton", text = "Log out" };
+            logoutButton.AddToClassList("account-toolbar-button-logout");
+
+            rightSideContainer.Add(_refreshButton);
+            rightSideContainer.Add(logoutButton);
+
+            // Constructing the final toolbar
+            Add(leftSideContainer);
+            Add(rightSideContainer);
+        }
+
+        private async void Refresh()
+        {
+            _refreshButton.SetEnabled(false);
+            await OnRefresh?.Invoke();
+            _refreshButton.SetEnabled(true);
+        }
+
+        private void Logout()
+        {
+            OnLogout?.Invoke();
+        }
+
+        public void SetUser(User user)
+        {
+            if (user == null)
+            {
+                _accountEmailLabel.text = string.Empty;
+                _accountImage.tooltip = string.Empty;
+                return;
+            }
+
+            var userEmail = !string.IsNullOrEmpty(user.Username) ? user.Username : "Unknown";
+            var publisherName = !string.IsNullOrEmpty(user.Name) ? user.Name : "Unknown";
+            var publisherId = !string.IsNullOrEmpty(user.PublisherId) ? user.PublisherId : "Unknown";
+            var userInfo =
+                $"Username: {userEmail}\n" +
+                $"Publisher Name: {publisherName}\n" +
+                $"Publisher ID: {publisherId}";
+
+            _accountEmailLabel.text = userEmail;
+            _accountImage.tooltip = userInfo;
+        }
+
+        public void EnableButtons()
+        {
+            _refreshButton.SetEnabled(true);
+        }
+
+        public void DisableButtons()
+        {
+            _refreshButton.SetEnabled(false);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/AccountToolbar.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/AccountToolbar.cs.meta
new file mode 100644
index 0000000..b179c6a
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/AccountToolbar.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 3c275be3817d1684ca1802c2738ac4d9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/AccountToolbar.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/AssetsWorkflowElement.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/AssetsWorkflowElement.cs
new file mode 100644
index 0000000..b46f139
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/AssetsWorkflowElement.cs
@@ -0,0 +1,215 @@
+using AssetStoreTools.Uploader.Data;
+using AssetStoreTools.Utility;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Uploader.UI.Elements
+{
+    internal class AssetsWorkflowElement : WorkflowElementBase
+    {
+        // Data
+        private AssetsWorkflow _workflow;
+
+        // UI
+        private VisualElement _dependenciesToggleElement;
+        private Toggle _dependenciesToggle;
+        private MultiToggleSelectionElement _dependenciesElement;
+        private MultiToggleSelectionElement _specialFoldersElement;
+
+        private const string PathSelectionTooltip = "Select the main folder of your package" +
+            "\n\nAll files and folders of your package should preferably be contained within a single root folder that is named after your package" +
+            "\n\nExample: 'Assets/[MyPackageName]'" +
+            "\n\nNote: If your content makes use of special folders that are required to be placed in the root Assets folder (e.g. 'StreamingAssets')," +
+            " you will be able to include them after selecting the main folder";
+
+        public AssetsWorkflowElement(AssetsWorkflow workflow) : base(workflow)
+        {
+            _workflow = workflow;
+
+            Create();
+            Deserialize();
+        }
+
+        private void Create()
+        {
+            CreatePathElement("Folder path", PathSelectionTooltip);
+            CreateDependenciesToggleElement();
+            CreateDependenciesSelectionElement();
+            CreateSpecialFoldersElement();
+            CreatePreviewGenerationElement();
+            CreateValidationElement(new CurrentProjectValidationElement(_workflow));
+            CreateUploadElement(_workflow, true);
+        }
+
+        private void CreateDependenciesToggleElement()
+        {
+            _dependenciesToggleElement = new VisualElement() { name = "Dependencies Toggle" };
+            _dependenciesToggleElement.AddToClassList("package-content-option-box");
+
+            VisualElement dependenciesLabelHelpRow = new VisualElement();
+            dependenciesLabelHelpRow.AddToClassList("package-content-option-label-help-row");
+
+            Label dependenciesLabel = new Label { text = "Dependencies" };
+            Image dependenciesLabelTooltip = new Image
+            {
+                tooltip = "Tick this checkbox if your package content has dependencies on Unity packages from the Package Manager"
+            };
+
+            _dependenciesToggle = new Toggle { name = "DependenciesToggle", text = "Include Package Manifest" };
+            _dependenciesToggle.AddToClassList("package-content-option-toggle");
+
+            var callback = new Action(() => DependencyToggleValueChange(true));
+            _dependenciesToggle.RegisterValueChangedCallback((_) => DependencyToggleValueChange(true));
+            RegisterCallback<AttachToPanelEvent>((_) => { ASToolsPreferences.OnSettingsChange += callback; });
+            RegisterCallback<DetachFromPanelEvent>((_) => { ASToolsPreferences.OnSettingsChange -= callback; });
+
+            dependenciesLabelHelpRow.Add(dependenciesLabel);
+            dependenciesLabelHelpRow.Add(dependenciesLabelTooltip);
+
+            _dependenciesToggleElement.Add(dependenciesLabelHelpRow);
+            _dependenciesToggleElement.Add(_dependenciesToggle);
+
+            _dependenciesToggleElement.style.display = DisplayStyle.None;
+            Add(_dependenciesToggleElement);
+        }
+
+        private void CreateDependenciesSelectionElement()
+        {
+            _dependenciesElement = new MultiToggleSelectionElement()
+            {
+                DisplayElementLabel = false,
+                ElementLabel = "Dependencies",
+                NoSelectionLabel = "No packages match this criteria"
+            };
+
+            var setDependencies = new Action<Dictionary<string, bool>>((dict) => _workflow.SetDependencies(dict.Where(x => x.Value).Select(x => x.Key), true));
+            _dependenciesElement.OnValuesChanged += setDependencies;
+            _dependenciesElement.style.display = DisplayStyle.None;
+            Add(_dependenciesElement);
+        }
+
+        private void CreateSpecialFoldersElement()
+        {
+            _specialFoldersElement = new MultiToggleSelectionElement()
+            {
+                ElementLabel = "Special Folders",
+                ElementTooltip = "If your package content relies on Special Folders (e.g. StreamingAssets), please select which of these folders should be included in the package.",
+                NoSelectionLabel = "No folders match this criteria."
+            };
+
+            var setSpecialFolders = new Action<Dictionary<string, bool>>((dict) => _workflow.SetSpecialFolders(dict.Where(x => x.Value).Select(x => x.Key), true));
+            _specialFoldersElement.OnValuesChanged += setSpecialFolders;
+            _specialFoldersElement.style.display = DisplayStyle.None;
+            Add(_specialFoldersElement);
+        }
+
+        protected override void BrowsePath()
+        {
+            string absoluteExportPath = string.Empty;
+            bool includeAllAssets = false;
+
+            if (_workflow.IsCompleteProject)
+            {
+                includeAllAssets = EditorUtility.DisplayDialog("Notice",
+                    "Your package draft is set to a category that is treated" +
+                    " as a complete project. Project settings will be included automatically. Would you like everything in the " +
+                    "'Assets' folder to be included?\n\nYou will still be able to change the selected assets before uploading",
+                    "Yes, include all folders and assets",
+                    "No, I'll select what to include manually");
+
+                if (includeAllAssets)
+                    absoluteExportPath = Application.dataPath;
+            }
+
+            if (!includeAllAssets)
+            {
+                absoluteExportPath = EditorUtility.OpenFolderPanel(
+                    "Select folder to compress into a package", "Assets/", "");
+
+                if (string.IsNullOrEmpty(absoluteExportPath))
+                    return;
+            }
+
+            var relativeExportPath = FileUtility.AbsolutePathToRelativePath(absoluteExportPath, ASToolsPreferences.Instance.EnableSymlinkSupport);
+            if (!_workflow.IsPathValid(relativeExportPath, out var error))
+            {
+                EditorUtility.DisplayDialog("Invalid selection", error, "OK");
+                return;
+            }
+
+            HandlePathSelection(relativeExportPath, true);
+            CheckForMissingMetas();
+        }
+
+        private void HandlePathSelection(string relativeExportPath, bool serialize)
+        {
+            if (string.IsNullOrEmpty(relativeExportPath))
+                return;
+
+            _workflow.SetMainExportPath(relativeExportPath, serialize);
+            SetPathSelectionTextField(relativeExportPath + "/");
+
+            _dependenciesToggleElement.style.display = DisplayStyle.Flex;
+            UpdateSpecialFoldersElement();
+        }
+
+        private void CheckForMissingMetas()
+        {
+            var paths = new List<string>() { _workflow.GetMainExportPath() };
+            paths.AddRange(_workflow.GetSpecialFolders());
+            CheckForMissingMetas(paths);
+        }
+
+        private void DependencyToggleValueChange(bool serialize)
+        {
+            _workflow.SetIncludeDependencies(_dependenciesToggle.value, serialize);
+
+            if (_dependenciesToggle.value && !ASToolsPreferences.Instance.UseLegacyExporting)
+            {
+                var allDependencies = _workflow.GetAvailableDependencies();
+                var selectedDependencies = allDependencies.ToDictionary(x => x, y => _workflow.GetDependencies().Any(x => x.name == y));
+                _dependenciesElement.Populate(selectedDependencies);
+                _dependenciesElement.style.display = DisplayStyle.Flex;
+            }
+            else
+            {
+                _dependenciesElement.style.display = DisplayStyle.None;
+            }
+        }
+
+        private void UpdateSpecialFoldersElement()
+        {
+            var availableSpecialFolders = _workflow.GetAvailableSpecialFolders();
+            var selectedSpecialFolders = availableSpecialFolders.ToDictionary(x => x, y => _workflow.GetSpecialFolders().Any(x => x == y));
+            _specialFoldersElement.Populate(selectedSpecialFolders);
+            _specialFoldersElement.style.display = availableSpecialFolders.Count > 0 ? DisplayStyle.Flex : DisplayStyle.None;
+        }
+
+        protected override void EnableInteraction()
+        {
+            base.EnableInteraction();
+            _dependenciesToggleElement.SetEnabled(true);
+            _dependenciesElement.SetEnabled(true);
+            _specialFoldersElement.SetEnabled(true);
+        }
+
+        protected override void DisableInteraction()
+        {
+            base.DisableInteraction();
+            _dependenciesToggleElement.SetEnabled(false);
+            _dependenciesElement.SetEnabled(false);
+            _specialFoldersElement.SetEnabled(false);
+        }
+
+        protected override void Deserialize()
+        {
+            HandlePathSelection(_workflow.GetMainExportPath(), false);
+            _dependenciesToggle.SetValueWithoutNotify(_workflow.GetIncludeDependencies());
+            DependencyToggleValueChange(false);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/AssetsWorkflowElement.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/AssetsWorkflowElement.cs.meta
new file mode 100644
index 0000000..4720aaa
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/AssetsWorkflowElement.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 1f62ea8ab5c102e4fa574a3dcac7f6fb
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/AssetsWorkflowElement.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/CurrentProjectValidationElement.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/CurrentProjectValidationElement.cs
new file mode 100644
index 0000000..00bb4b9
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/CurrentProjectValidationElement.cs
@@ -0,0 +1,31 @@
+using AssetStoreTools.Uploader.Data;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Uploader.UI.Elements
+{
+    internal class CurrentProjectValidationElement : ValidationElementBase
+    {
+        public CurrentProjectValidationElement(IWorkflow workflow) : base(workflow)
+        {
+            Create();
+        }
+
+        private void Create()
+        {
+            CreateResultsBox();
+        }
+
+        private void CreateResultsBox()
+        {
+            var _viewReportButton = new Button(ViewReport) { text = "View report" };
+            _viewReportButton.AddToClassList("validation-result-view-report-button");
+
+            ResultsBox.Add(_viewReportButton);
+        }
+
+        private void ViewReport()
+        {
+            AssetStoreTools.ShowAssetStoreToolsValidator(Workflow.LastValidationSettings, Workflow.LastValidationResult);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/CurrentProjectValidationElement.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/CurrentProjectValidationElement.cs.meta
new file mode 100644
index 0000000..e3073c3
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/CurrentProjectValidationElement.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 21a1f13231b167b4c80079a2c1212101
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/CurrentProjectValidationElement.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/ExternalProjectValidationElement.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/ExternalProjectValidationElement.cs
new file mode 100644
index 0000000..1c7b96a
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/ExternalProjectValidationElement.cs
@@ -0,0 +1,92 @@
+using AssetStoreTools.Uploader.Data;
+using AssetStoreTools.Utility;
+using AssetStoreTools.Validator;
+using System;
+using System.IO;
+using UnityEditor;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Uploader.UI.Elements
+{
+    internal class ExternalProjectValidationElement : ValidationElementBase
+    {
+        private VisualElement _projectButtonContainer;
+
+        public ExternalProjectValidationElement(IWorkflow workflow) : base(workflow)
+        {
+            Create();
+        }
+
+        private void Create()
+        {
+            CreateProjectButtonContainer();
+            CreateProjectButtons();
+        }
+
+        private void CreateProjectButtonContainer()
+        {
+            _projectButtonContainer = new VisualElement();
+            _projectButtonContainer.AddToClassList("validation-result-view-report-button-container");
+
+            ResultsBox.Add(_projectButtonContainer);
+        }
+
+        private void CreateProjectButtons()
+        {
+            var openButton = new Button(OpenProject) { text = "Open Project" };
+            openButton.AddToClassList("validation-result-view-report-button");
+
+            var saveButton = new Button(SaveProject) { text = "Save Project" };
+            saveButton.AddToClassList("validation-result-view-report-button");
+
+            _projectButtonContainer.Add(openButton);
+            _projectButtonContainer.Add(saveButton);
+        }
+
+        private void OpenProject()
+        {
+            try
+            {
+                EditorUtility.DisplayProgressBar("Waiting...", "Validation project is open. Waiting for it to exit...", 0.4f);
+                var projectPath = Workflow.LastValidationResult.ProjectPath;
+                ExternalProjectValidator.OpenExternalValidationProject(projectPath);
+            }
+            finally
+            {
+                EditorUtility.ClearProgressBar();
+            }
+        }
+
+        private void SaveProject()
+        {
+            try
+            {
+                var projectPath = Workflow.LastValidationResult.ProjectPath;
+                var savePath = EditorUtility.SaveFolderPanel("Select a folder", Environment.GetFolderPath(Environment.SpecialFolder.Desktop), string.Empty);
+                if (string.IsNullOrEmpty(savePath))
+                    return;
+
+                var saveDir = new DirectoryInfo(savePath);
+                if (!saveDir.Exists || saveDir.GetFileSystemInfos().Length != 0)
+                {
+                    EditorUtility.DisplayDialog("Saving project failed", "Selected directory must be an empty folder", "OK");
+                    return;
+                }
+
+                EditorUtility.DisplayProgressBar("Saving...", "Saving project...", 0.4f);
+                FileUtility.CopyDirectory(projectPath, savePath, true);
+            }
+            finally
+            {
+                EditorUtility.ClearProgressBar();
+            }
+        }
+
+        protected override bool ConfirmValidation()
+        {
+            return EditorUtility.DisplayDialog("Notice", "Pre-exported package validation is performed in a separate temporary project. " +
+                "It may take some time for the temporary project to be created, which will halt any actions in the current project. " +
+                "The current project will resume work after the temporary project is exited.\n\nDo you wish to proceed?", "Yes", "No");
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/ExternalProjectValidationElement.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/ExternalProjectValidationElement.cs.meta
new file mode 100644
index 0000000..5178519
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/ExternalProjectValidationElement.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 706f01d53c7eaf04bae07fb36684e31b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/ExternalProjectValidationElement.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/HybridPackageWorkflowElement.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/HybridPackageWorkflowElement.cs
new file mode 100644
index 0000000..7be05ed
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/HybridPackageWorkflowElement.cs
@@ -0,0 +1,116 @@
+using AssetStoreTools.Uploader.Data;
+using AssetStoreTools.Utility;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Uploader.UI.Elements
+{
+    internal class HybridPackageWorkflowElement : WorkflowElementBase
+    {
+        // Data
+        private HybridPackageWorkflow _workflow;
+
+        // UI
+        private MultiToggleSelectionElement _dependenciesElement;
+
+        public HybridPackageWorkflowElement(HybridPackageWorkflow workflow) : base(workflow)
+        {
+            _workflow = workflow;
+
+            Create();
+            Deserialize();
+        }
+
+        private void Create()
+        {
+            CreatePathElement("Package path", "Select a local Package you would like to export and upload to the Store.");
+            CreateDependenciesElement();
+            CreatePreviewGenerationElement();
+            CreateValidationElement(new CurrentProjectValidationElement(_workflow));
+            CreateUploadElement(_workflow, true);
+        }
+
+        private void CreateDependenciesElement()
+        {
+            _dependenciesElement = new MultiToggleSelectionElement()
+            {
+                ElementLabel = "Dependencies",
+                ElementTooltip = "Select which local package dependencies should be included when exporting." +
+                "\n\nNote that only local or embedded dependencies defined in the package.json can be selected.",
+                NoSelectionLabel = "No packages match this criteria"
+            };
+
+            var setDependencies = new Action<Dictionary<string, bool>>((dict) => _workflow.SetDependencies(dict.Where(x => x.Value).Select(x => x.Key), true));
+            _dependenciesElement.OnValuesChanged += setDependencies;
+            Add(_dependenciesElement);
+            _dependenciesElement.style.display = DisplayStyle.None;
+        }
+
+        protected override void BrowsePath()
+        {
+            var absoluteExportPath = EditorUtility.OpenFilePanel("Select a package.json file", "Packages/", "json");
+            if (string.IsNullOrEmpty(absoluteExportPath))
+                return;
+
+            if (!_workflow.IsPathValid(absoluteExportPath, out var error))
+            {
+                EditorUtility.DisplayDialog("Invalid selection", error, "OK");
+                return;
+            }
+
+            HandlePathSelection(absoluteExportPath, true);
+            CheckForMissingMetas();
+        }
+
+        private void HandlePathSelection(string packageManifestPath, bool serialize)
+        {
+            if (string.IsNullOrEmpty(packageManifestPath))
+                return;
+
+            _workflow.SetPackage(packageManifestPath, serialize);
+            var packageFolderPath = _workflow.GetPackage().assetPath;
+            SetPathSelectionTextField(packageFolderPath + "/");
+
+            UpdateDependenciesElement();
+        }
+
+        private void CheckForMissingMetas()
+        {
+            var paths = new List<string>() { _workflow.GetPackage().assetPath };
+            paths.AddRange(_workflow.GetDependencies().Select(x => x.assetPath));
+            CheckForMissingMetas(paths);
+        }
+
+        private void UpdateDependenciesElement()
+        {
+            var availableDependencies = _workflow.GetAvailableDependencies();
+            var selectedDependencies = availableDependencies.ToDictionary(x => x.name, y => _workflow.GetDependencies().Any(x => x.name == y.name));
+            _dependenciesElement.Populate(selectedDependencies);
+            _dependenciesElement.style.display = availableDependencies.Count > 0 ? DisplayStyle.Flex : DisplayStyle.None;
+        }
+
+        protected override void EnableInteraction()
+        {
+            base.EnableInteraction();
+            _dependenciesElement.SetEnabled(true);
+        }
+
+        protected override void DisableInteraction()
+        {
+            base.DisableInteraction();
+            _dependenciesElement.SetEnabled(false);
+        }
+
+        protected override void Deserialize()
+        {
+            var package = _workflow.GetPackage();
+            if (package == null)
+                return;
+
+            HandlePathSelection(AssetDatabase.GetAssetPath(package.GetManifestAsset()), false);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/HybridPackageWorkflowElement.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/HybridPackageWorkflowElement.cs.meta
new file mode 100644
index 0000000..e39801c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/HybridPackageWorkflowElement.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 34cd1e5cbe87bb546937a521bd2bc69c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/HybridPackageWorkflowElement.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/LoadingSpinner.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/LoadingSpinner.cs
new file mode 100644
index 0000000..02d7ee5
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/LoadingSpinner.cs
@@ -0,0 +1,52 @@
+using UnityEditor;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Uploader.UI.Elements
+{
+    internal class LoadingSpinner : VisualElement
+    {
+        // Data
+        private int _spinIndex;
+        private double _spinTimer;
+        private double _spinThreshold = 0.1;
+
+        // UI
+        private Image _spinnerImage;
+
+        public LoadingSpinner()
+        {
+            AddToClassList("loading-spinner-box");
+
+            _spinnerImage = new Image { name = "SpinnerImage" };
+            _spinnerImage.AddToClassList("loading-spinner-image");
+
+            Add(_spinnerImage);
+        }
+
+        public void Show()
+        {
+            EditorApplication.update += SpinnerLoop;
+            style.display = DisplayStyle.Flex;
+        }
+
+        public void Hide()
+        {
+            EditorApplication.update -= SpinnerLoop;
+            style.display = DisplayStyle.None;
+        }
+
+        private void SpinnerLoop()
+        {
+            if (_spinTimer + _spinThreshold > EditorApplication.timeSinceStartup)
+                return;
+
+            _spinTimer = EditorApplication.timeSinceStartup;
+            _spinnerImage.image = EditorGUIUtility.IconContent($"WaitSpin{_spinIndex:00}").image;
+
+            _spinIndex += 1;
+
+            if (_spinIndex > 11)
+                _spinIndex = 0;
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/LoadingSpinner.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/LoadingSpinner.cs.meta
new file mode 100644
index 0000000..d3c31ba
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/LoadingSpinner.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 7c7cdef91eb9a894091869ca10d9d178
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/LoadingSpinner.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/MultiToggleSelectionElement.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/MultiToggleSelectionElement.cs
new file mode 100644
index 0000000..d3de7ba
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/MultiToggleSelectionElement.cs
@@ -0,0 +1,187 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Uploader.UI.Elements
+{
+    internal class MultiToggleSelectionElement : VisualElement
+    {
+        // Data
+        private Dictionary<string, bool> _selections;
+        private readonly List<string> _selectionFilters = new List<string> { "All", "Selected", "Not Selected" };
+        private string _activeFilter;
+
+        public bool DisplayElementLabel
+        {
+            get => _multiToggleSelectionHelpRow.style.visibility == Visibility.Visible;
+            set { _multiToggleSelectionHelpRow.style.visibility = value ? Visibility.Visible : Visibility.Hidden; }
+        }
+
+        public string ElementLabel { get => _multiToggleSelectionLabel.text; set { _multiToggleSelectionLabel.text = value; } }
+        public string ElementTooltip { get => _multiToggleSelectionTooltip.tooltip; set { _multiToggleSelectionTooltip.tooltip = value; } }
+        public string NoSelectionLabel { get => _noSelectionsLabel.text; set { _noSelectionsLabel.text = value; } }
+
+        // UI
+        private VisualElement _multiToggleSelectionHelpRow;
+        private Label _multiToggleSelectionLabel;
+        private Image _multiToggleSelectionTooltip;
+
+        private ScrollView _selectionTogglesBox;
+        private Label _noSelectionsLabel;
+        private ToolbarMenu _filteringDropdown;
+
+        public event Action<Dictionary<string, bool>> OnValuesChanged;
+
+        public MultiToggleSelectionElement()
+        {
+            _activeFilter = _selectionFilters[0];
+            AddToClassList("package-content-option-box");
+            Create();
+        }
+
+        private void Create()
+        {
+            _multiToggleSelectionHelpRow = new VisualElement();
+            _multiToggleSelectionHelpRow.AddToClassList("package-content-option-label-help-row");
+
+            _multiToggleSelectionLabel = new Label();
+            _multiToggleSelectionTooltip = new Image();
+
+            VisualElement fullSelectionBox = new VisualElement();
+            fullSelectionBox.AddToClassList("multi-toggle-box");
+
+            _selectionTogglesBox = new ScrollView { name = "DependencyToggles" };
+            _selectionTogglesBox.AddToClassList("multi-toggle-box-scrollview");
+
+            _noSelectionsLabel = new Label();
+            _noSelectionsLabel.AddToClassList("multi-toggle-box-empty-label");
+
+            var scrollContainer = _selectionTogglesBox.Q<VisualElement>("unity-content-viewport");
+            scrollContainer.Add(_noSelectionsLabel);
+
+            VisualElement filteringBox = new VisualElement();
+            filteringBox.AddToClassList("multi-toggle-box-toolbar");
+
+            // Select - deselect buttons
+            VisualElement selectingBox = new VisualElement();
+            selectingBox.AddToClassList("multi-toggle-box-toolbar-selecting-box");
+
+            Button selectAllButton = new Button(SelectAllToggles)
+            {
+                text = "Select All"
+            };
+
+            Button deSelectAllButton = new Button(UnselectAllToggles)
+            {
+                text = "Deselect All"
+            };
+
+            selectingBox.Add(selectAllButton);
+            selectingBox.Add(deSelectAllButton);
+
+            // Filtering dropdown
+            VisualElement filteringDropdownBox = new VisualElement();
+            filteringDropdownBox.AddToClassList("multi-toggle-box-toolbar-filtering-box");
+
+            _filteringDropdown = new ToolbarMenu { text = _selectionFilters[0] };
+
+            foreach (var filter in _selectionFilters)
+                _filteringDropdown.menu.AppendAction(filter, (_) => { FilterDependencies(filter); });
+
+            filteringDropdownBox.Add(_filteringDropdown);
+
+            // Final adding
+            filteringBox.Add(filteringDropdownBox);
+            filteringBox.Add(selectingBox);
+
+            fullSelectionBox.Add(_selectionTogglesBox);
+            fullSelectionBox.Add(filteringBox);
+
+            _multiToggleSelectionHelpRow.Add(_multiToggleSelectionLabel);
+            _multiToggleSelectionHelpRow.Add(_multiToggleSelectionTooltip);
+
+            Add(_multiToggleSelectionHelpRow);
+            Add(fullSelectionBox);
+        }
+
+        public void Populate(Dictionary<string, bool> selections)
+        {
+            _selectionTogglesBox.Clear();
+            _selections = selections;
+
+            EventCallback<ChangeEvent<bool>, string> callback = OnToggle;
+
+            foreach (var kvp in selections)
+            {
+                var toggle = new Toggle() { text = kvp.Key, value = kvp.Value };
+                toggle.AddToClassList("multi-toggle-box-toggle");
+                toggle.RegisterCallback(callback, toggle.text);
+                _selectionTogglesBox.Add(toggle);
+            }
+
+            FilterDependencies(_activeFilter);
+        }
+
+        private void FilterDependencies(string filter)
+        {
+            _activeFilter = filter;
+
+            var allToggles = _selectionTogglesBox.Children().Cast<Toggle>().ToArray();
+            var selectedIndex = _selectionFilters.FindIndex(x => x == filter);
+
+            switch (selectedIndex)
+            {
+                case 0:
+                    foreach (var toggle in allToggles)
+                        toggle.style.display = DisplayStyle.Flex;
+                    break;
+                case 1:
+                    foreach (var toggle in allToggles)
+                        toggle.style.display = toggle.value ? DisplayStyle.Flex : DisplayStyle.None;
+                    break;
+                case 2:
+                    foreach (var toggle in allToggles)
+                        toggle.style.display = toggle.value ? DisplayStyle.None : DisplayStyle.Flex;
+                    break;
+            }
+
+            // Check if any toggles are displayed
+            var count = allToggles.Count(toggle => toggle.style.display == DisplayStyle.Flex);
+            _noSelectionsLabel.style.display = count > 0 ? DisplayStyle.None : DisplayStyle.Flex;
+
+            _filteringDropdown.text = filter;
+        }
+
+        private void OnToggle(ChangeEvent<bool> evt, string text)
+        {
+            FilterDependencies(_activeFilter);
+            _selections[text] = evt.newValue;
+            OnValuesChanged?.Invoke(_selections);
+        }
+
+        private void OnAllToggles(bool value)
+        {
+            var allToggles = _selectionTogglesBox.Children().Cast<Toggle>();
+            foreach (var toggle in allToggles)
+                toggle.SetValueWithoutNotify(value);
+
+            foreach (var key in _selections.Keys.ToArray())
+                _selections[key] = value;
+
+            FilterDependencies(_activeFilter);
+            OnValuesChanged?.Invoke(_selections);
+        }
+
+        private void SelectAllToggles()
+        {
+            OnAllToggles(true);
+        }
+
+        private void UnselectAllToggles()
+        {
+            OnAllToggles(false);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/MultiToggleSelectionElement.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/MultiToggleSelectionElement.cs.meta
new file mode 100644
index 0000000..ec5d84c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/MultiToggleSelectionElement.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 19e30766043794345beb432973e0eb3c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/MultiToggleSelectionElement.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageContentElement.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageContentElement.cs
new file mode 100644
index 0000000..b15b3b5
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageContentElement.cs
@@ -0,0 +1,137 @@
+using AssetStoreTools.Uploader.Data;
+using AssetStoreTools.Utility;
+using System.Collections.Generic;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Uploader.UI.Elements
+{
+    internal class PackageContentElement : VisualElement
+    {
+        // Data
+        private IPackageContent _content;
+        private List<WorkflowElementBase> _workflowElements;
+
+        // UI
+        private VisualElement _workflowSelectionBox;
+        private ToolbarMenu _toolbarMenu;
+
+        public PackageContentElement(IPackageContent content)
+        {
+            _content = content;
+            content.OnActiveWorkflowChanged += ActiveWorkflowChanged;
+
+            _workflowElements = new List<WorkflowElementBase>();
+
+            Create();
+        }
+
+        private void Create()
+        {
+            AddToClassList("package-content-element");
+
+            CreateWorkflowSelection();
+            CreateWorkflows();
+            Deserialize();
+        }
+
+        private void CreateWorkflowSelection()
+        {
+            _workflowSelectionBox = new VisualElement();
+            _workflowSelectionBox.AddToClassList("package-content-option-box");
+
+            VisualElement labelHelpRow = new VisualElement();
+            labelHelpRow.AddToClassList("package-content-option-label-help-row");
+
+            Label workflowLabel = new Label { text = "Upload type" };
+            Image workflowLabelTooltip = new Image
+            {
+                tooltip = "Select what content you are uploading to the Asset Store"
+                + "\n\n- From Assets Folder - content located within the project's 'Assets' folder or one of its subfolders"
+                + "\n\n- Pre-exported .unitypackage - content that has already been compressed into a .unitypackage file"
+#if UNITY_ASTOOLS_EXPERIMENTAL
+                + "\n\n- Local UPM Package - content that is located within the project's 'Packages' folder. Only embedded and local packages are supported"
+#endif
+            };
+
+            labelHelpRow.Add(workflowLabel);
+            labelHelpRow.Add(workflowLabelTooltip);
+
+            _toolbarMenu = new ToolbarMenu();
+            _toolbarMenu.AddToClassList("package-content-option-dropdown");
+
+            foreach (var workflow in _content.GetAvailableWorkflows())
+            {
+                AppendToolbarActionForWorkflow(workflow);
+            }
+
+            _workflowSelectionBox.Add(labelHelpRow);
+            _workflowSelectionBox.Add(_toolbarMenu);
+
+            Add(_workflowSelectionBox);
+        }
+
+        private void AppendToolbarActionForWorkflow(IWorkflow workflow)
+        {
+            _toolbarMenu.menu.AppendAction(workflow.DisplayName, _ =>
+            {
+                _content.SetActiveWorkflow(workflow);
+            });
+        }
+
+        private void CreateWorkflows()
+        {
+            foreach (var workflow in _content.GetAvailableWorkflows())
+            {
+                WorkflowElementBase element;
+                switch (workflow)
+                {
+                    case AssetsWorkflow assetsWorkflow:
+                        element = new AssetsWorkflowElement(assetsWorkflow);
+                        break;
+                    case UnityPackageWorkflow unityPackageWorkflow:
+                        element = new UnityPackageWorkflowElement(unityPackageWorkflow);
+                        break;
+#if UNITY_ASTOOLS_EXPERIMENTAL
+                    case HybridPackageWorkflow hybridPackageWorkflow:
+                        element = new HybridPackageWorkflowElement(hybridPackageWorkflow);
+                        break;
+#endif
+                    default:
+                        ASDebug.LogWarning("Package Content Element received an undefined workflow");
+                        continue;
+                }
+
+                element.OnInteractionAvailable += EnableInteraction;
+                element.OnInteractionUnavailable += DisableInteraction;
+                _workflowElements.Add(element);
+                Add(element);
+            }
+        }
+
+        private void ActiveWorkflowChanged(IWorkflow workflow)
+        {
+            _toolbarMenu.text = workflow.DisplayName;
+            foreach (var workflowElement in _workflowElements)
+            {
+                bool show = workflowElement.Is(workflow);
+                workflowElement.style.display = show ? DisplayStyle.Flex : DisplayStyle.None;
+            }
+        }
+
+        private void EnableInteraction()
+        {
+            _workflowSelectionBox.SetEnabled(true);
+        }
+
+        private void DisableInteraction()
+        {
+            _workflowSelectionBox.SetEnabled(false);
+        }
+
+        private void Deserialize()
+        {
+            ActiveWorkflowChanged(_content.GetActiveWorkflow());
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageContentElement.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageContentElement.cs.meta
new file mode 100644
index 0000000..e751748
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageContentElement.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 09927e9c8fd6e074fa451add92b7ab6f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageContentElement.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageElement.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageElement.cs
new file mode 100644
index 0000000..5f2735d
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageElement.cs
@@ -0,0 +1,215 @@
+using AssetStoreTools.Api;
+using AssetStoreTools.Uploader.Data;
+using AssetStoreTools.Uploader.Services;
+using System;
+#if !UNITY_2021_1_OR_NEWER
+using UnityEditor.UIElements;
+#endif
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Uploader.UI.Elements
+{
+    internal class PackageElement : VisualElement
+    {
+        // Data
+        private IPackage _package;
+        private bool _isSelected;
+
+        private IPackageFactoryService _packageFactory;
+
+        // UI
+        private Button _foldoutBox;
+        private Label _expanderLabel;
+        private Label _assetLabel;
+        private Label _lastDateSizeLabel;
+        private Image _assetImage;
+
+        private ProgressBar _uploadProgressBar;
+        private VisualElement _uploadProgressBarBackground;
+
+        private PackageContentElement _contentElement;
+
+        public event Action OnSelected;
+
+        public PackageElement(IPackage package, IPackageFactoryService packageFactory)
+        {
+            _package = package;
+            _package.OnUpdate += Refresh;
+            _package.OnIconUpdate += SetPackageThumbnail;
+
+            _packageFactory = packageFactory;
+
+            _isSelected = false;
+
+            Create();
+        }
+
+        private void Create()
+        {
+            AddToClassList("package-full-box");
+
+            _foldoutBox = new Button { name = "Package" };
+            _foldoutBox.AddToClassList("package-foldout-box");
+            if (_package.IsDraft)
+                _foldoutBox.AddToClassList("package-foldout-box-draft");
+            _foldoutBox.clickable.clicked += Toggle;
+
+            // Expander, Icon and Asset Label
+            VisualElement foldoutBoxInfo = new VisualElement { name = "foldoutBoxInfo" };
+            foldoutBoxInfo.AddToClassList("package-foldout-box-info");
+
+            VisualElement labelExpanderRow = new VisualElement { name = "labelExpanderRow" };
+            labelExpanderRow.AddToClassList("package-expander-label-row");
+
+            _expanderLabel = new Label { name = "ExpanderLabel", text = "►" };
+            _expanderLabel.AddToClassList("package-expander");
+            _expanderLabel.style.display = _package.IsDraft ? DisplayStyle.Flex : DisplayStyle.None;
+
+            _assetImage = new Image { name = "AssetImage" };
+            _assetImage.AddToClassList("package-image");
+
+            VisualElement assetLabelInfoBox = new VisualElement { name = "assetLabelInfoBox" };
+            assetLabelInfoBox.AddToClassList("package-label-info-box");
+
+            _assetLabel = new Label { name = "AssetLabel", text = _package.Name };
+            _assetLabel.AddToClassList("package-label");
+
+            _lastDateSizeLabel = new Label { name = "AssetInfoLabel", text = FormatDateSize() };
+            _lastDateSizeLabel.AddToClassList("package-info");
+
+            assetLabelInfoBox.Add(_assetLabel);
+            assetLabelInfoBox.Add(_lastDateSizeLabel);
+
+            labelExpanderRow.Add(_expanderLabel);
+            labelExpanderRow.Add(_assetImage);
+            labelExpanderRow.Add(assetLabelInfoBox);
+
+            var openInBrowserButton = new Button(OpenPackageInBrowser)
+            {
+                name = "OpenInBrowserButton",
+                tooltip = "View your package in the Publishing Portal."
+            };
+            openInBrowserButton.AddToClassList("package-open-in-browser-button");
+
+            // Header Progress bar
+            _uploadProgressBar = new ProgressBar { name = "HeaderProgressBar" };
+            _uploadProgressBar.AddToClassList("package-header-progress-bar");
+            _uploadProgressBar.style.display = DisplayStyle.None;
+            _uploadProgressBarBackground = _uploadProgressBar.Q<VisualElement>(className: "unity-progress-bar__progress");
+
+            // Connect it all
+            foldoutBoxInfo.Add(labelExpanderRow);
+            foldoutBoxInfo.Add(openInBrowserButton);
+
+            _foldoutBox.Add(foldoutBoxInfo);
+            _foldoutBox.Add(_uploadProgressBar);
+
+            Add(_foldoutBox);
+        }
+
+        private void CreateFoldoutContent()
+        {
+            var content = _packageFactory.CreatePackageContent(_package);
+            if (content == null)
+                return;
+
+            _contentElement = new PackageContentElement(content);
+            _contentElement.style.display = DisplayStyle.None;
+            Add(_contentElement);
+
+            SubscribeToContentWorkflowUpdates(content);
+        }
+
+        private void SubscribeToContentWorkflowUpdates(IPackageContent content)
+        {
+            foreach (var workflow in content.GetAvailableWorkflows())
+            {
+                workflow.OnUploadStateChanged += UpdateProgressBar;
+            }
+        }
+
+        private void UpdateProgressBar(UploadStatus? status, float? progress)
+        {
+            if (status != null)
+            {
+                _uploadProgressBarBackground.style.backgroundColor = PackageUploadElement.GetColorByStatus(status.Value);
+            }
+
+            if (progress != null)
+            {
+                _uploadProgressBar.value = progress.Value;
+            }
+        }
+
+        private void Toggle()
+        {
+            if (!_package.IsDraft)
+                return;
+
+            if (!Contains(_contentElement))
+                CreateFoldoutContent();
+
+            var shouldExpand = !_isSelected;
+            _expanderLabel.text = shouldExpand ? "▼" : "►";
+
+            if (shouldExpand)
+                _foldoutBox.AddToClassList("package-foldout-box-expanded");
+            else
+                _foldoutBox.RemoveFromClassList("package-foldout-box-expanded");
+            _contentElement.style.display = shouldExpand ? DisplayStyle.Flex : DisplayStyle.None;
+
+            _isSelected = !_isSelected;
+            ToggleProgressBar();
+
+            if (_isSelected)
+                OnSelected?.Invoke();
+        }
+
+        private void ToggleProgressBar()
+        {
+            if (!_isSelected && _uploadProgressBar.value != 0)
+                _uploadProgressBar.style.display = DisplayStyle.Flex;
+            else
+                _uploadProgressBar.style.display = DisplayStyle.None;
+        }
+
+        public bool Is(IPackage package)
+        {
+            return package == _package;
+        }
+
+        public void Select()
+        {
+            if (!_isSelected)
+                Toggle();
+        }
+
+        public void Unselect()
+        {
+            if (_isSelected)
+                Toggle();
+        }
+
+        private void SetPackageThumbnail()
+        {
+            _assetImage.image = _package.Icon;
+        }
+
+        private void Refresh()
+        {
+            _assetLabel.text = _package.Name;
+            _lastDateSizeLabel.text = FormatDateSize();
+        }
+
+        private string FormatDateSize()
+        {
+            return $"{_package.Category} | {_package.FormattedSize()} | {_package.FormattedModified()}";
+        }
+
+        private void OpenPackageInBrowser()
+        {
+            Application.OpenURL($"https://publisher.unity.com/packages/{_package.VersionId}/edit/upload");
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageElement.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageElement.cs.meta
new file mode 100644
index 0000000..9305aeb
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageElement.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: cef5f23043d318945b844bcac7a7a984
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageElement.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageGroupElement.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageGroupElement.cs
new file mode 100644
index 0000000..6310afb
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageGroupElement.cs
@@ -0,0 +1,149 @@
+using AssetStoreTools.Uploader.Data;
+using AssetStoreTools.Uploader.Services;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Uploader.UI.Elements
+{
+    internal class PackageGroupElement : VisualElement
+    {
+        // Data
+        public string Name => _packageGroup.Name;
+        private IPackageGroup _packageGroup;
+        private List<PackageElement> _packageElements;
+        private bool _isExpanded;
+
+        private IPackageFactoryService _packageFactory;
+
+        // UI
+        private Button _groupExpanderBox;
+        private VisualElement _groupContent;
+
+        private Label _expanderLabel;
+        private Label _groupLabel;
+
+        public PackageGroupElement(IPackageGroup packageGroup, IPackageFactoryService packageFactory)
+        {
+            _packageGroup = packageGroup;
+            _packageElements = new List<PackageElement>();
+            _packageGroup.OnPackagesSorted += RefreshPackages;
+            _packageGroup.OnPackagesFiltered += RefreshPackages;
+
+            _packageFactory = packageFactory;
+
+            Create();
+        }
+
+        private void Create()
+        {
+            CreatePackageGroup();
+            CreatePackageGroupContent();
+            AddPackagesToGroupContent();
+        }
+
+        protected void CreatePackageGroup()
+        {
+            _groupExpanderBox = new Button(OnPackageGroupClicked);
+            _groupExpanderBox.AddToClassList("package-group-expander-box");
+
+            _expanderLabel = new Label { name = "ExpanderLabel", text = "►" };
+            _expanderLabel.AddToClassList("package-group-expander");
+
+            _groupLabel = new Label { text = $"{_packageGroup.Name} ({_packageGroup.Packages.Count})" };
+            _groupLabel.AddToClassList("package-group-label");
+            FormatGroupLabel(_packageGroup.Packages.Count);
+
+            _groupExpanderBox.Add(_expanderLabel);
+            _groupExpanderBox.Add(_groupLabel);
+
+            Add(_groupExpanderBox);
+        }
+
+        private void CreatePackageGroupContent()
+        {
+            _groupContent = new VisualElement { name = "GroupContentBox" };
+            _groupContent.AddToClassList("package-group-content-box");
+            Toggle(false);
+
+            var groupSeparator = new VisualElement { name = "GroupSeparator" };
+            groupSeparator.AddToClassList("package-group-separator");
+
+            if (_packageGroup.Name.ToLower() != "draft")
+            {
+                _groupLabel.SetEnabled(false);
+                _groupContent.AddToClassList("unity-disabled");
+                groupSeparator.style.display = DisplayStyle.Flex;
+            }
+
+            Add(_groupContent);
+            Add(groupSeparator);
+        }
+
+        private void AddPackagesToGroupContent()
+        {
+            foreach (var package in _packageGroup.Packages)
+            {
+                var packageElement = new PackageElement(package, _packageFactory);
+                packageElement.OnSelected += () => OnPackageSelected(packageElement);
+                _packageElements.Add(packageElement);
+            }
+        }
+
+        private void FormatGroupLabel(int displayedPackageCount)
+        {
+            if (_packageGroup.Packages.Count == displayedPackageCount)
+                _groupLabel.text = $"{Name} ({displayedPackageCount})";
+            else
+                _groupLabel.text = $"{Name} ({displayedPackageCount}/{_packageGroup.Packages.Count})";
+        }
+
+        private void RefreshPackages(List<IPackage> packages)
+        {
+            _groupContent.Clear();
+
+            foreach (var package in packages)
+            {
+                var correspondingElement = _packageElements.FirstOrDefault(x => x.Is(package));
+                if (correspondingElement == null)
+                    continue;
+
+                _groupContent.Add(correspondingElement);
+            }
+
+            FormatGroupLabel(packages.Count());
+        }
+
+        private void OnPackageGroupClicked()
+        {
+            Toggle(!_isExpanded);
+        }
+
+        public void Toggle(bool expand)
+        {
+            if (expand)
+            {
+                _expanderLabel.text = "▼";
+                _groupContent.style.display = DisplayStyle.Flex;
+            }
+            else
+            {
+                _expanderLabel.text = "►";
+                _groupContent.style.display = DisplayStyle.None;
+            }
+
+            _isExpanded = expand;
+        }
+
+        private void OnPackageSelected(PackageElement packageElement)
+        {
+            foreach (var element in _packageElements)
+            {
+                if (element == packageElement)
+                    continue;
+
+                element.Unselect();
+            }
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageGroupElement.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageGroupElement.cs.meta
new file mode 100644
index 0000000..a321632
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageGroupElement.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 41e322a1418ab824182eade111145dff
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageGroupElement.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageListToolbar.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageListToolbar.cs
new file mode 100644
index 0000000..94fecff
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageListToolbar.cs
@@ -0,0 +1,58 @@
+using AssetStoreTools.Uploader.Data;
+using System.Collections.Generic;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Uploader.UI.Elements
+{
+    internal class PackageListToolbar : VisualElement
+    {
+        private List<IPackageGroup> _packageGroups;
+
+        public PackageListToolbar()
+        {
+            Create();
+        }
+
+        private void Create()
+        {
+            AddToClassList("package-list-toolbar");
+
+            // Search
+            var searchField = new ToolbarSearchField { name = "SearchField" };
+            searchField.AddToClassList("package-search-field");
+
+            // Sorting menu button
+            var sortMenu = new ToolbarMenu() { text = "Sort: Name ↓" };
+            sortMenu.menu.AppendAction("Sort: Name ↓", (_) => { sortMenu.text = "Sort: Name ↓"; Sort(PackageSorting.Name); });
+            sortMenu.menu.AppendAction("Sort: Updated ↓", (_) => { sortMenu.text = "Sort: Updated ↓"; Sort(PackageSorting.Date); });
+            sortMenu.menu.AppendAction("Sort: Category ↓", (_) => { sortMenu.text = "Sort: Category ↓"; Sort(PackageSorting.Category); });
+            sortMenu.AddToClassList("package-sort-menu");
+
+            // Finalize the bar
+            Add(searchField);
+            Add(sortMenu);
+
+            // Add Callbacks and click events
+            searchField.RegisterCallback<ChangeEvent<string>>(SearchFilter);
+        }
+
+        public void SetPackageGroups(List<IPackageGroup> packageGroups)
+        {
+            _packageGroups = packageGroups;
+        }
+
+        private void SearchFilter(ChangeEvent<string> evt)
+        {
+            var searchString = evt.newValue.ToLower();
+            foreach (var packageGroup in _packageGroups)
+                packageGroup.Filter(searchString);
+        }
+
+        public void Sort(PackageSorting sortingType)
+        {
+            foreach (var packageGroup in _packageGroups)
+                packageGroup.Sort(sortingType);
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageListToolbar.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageListToolbar.cs.meta
new file mode 100644
index 0000000..afedf2e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageListToolbar.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 6d2659328222e0e4cb36cd194e023f4b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageListToolbar.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageUploadElement.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageUploadElement.cs
new file mode 100644
index 0000000..a0af433
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageUploadElement.cs
@@ -0,0 +1,321 @@
+using AssetStoreTools.Api;
+using AssetStoreTools.Api.Responses;
+using AssetStoreTools.Exporter;
+using AssetStoreTools.Uploader.Data;
+using AssetStoreTools.Utility;
+using System;
+using System.IO;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using UnityEditor;
+#if !UNITY_2021_1_OR_NEWER
+using UnityEditor.UIElements;
+#endif
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Uploader.UI.Elements
+{
+    internal class PackageUploadElement : VisualElement
+    {
+        // Data
+        private IWorkflow _workflow;
+        private bool _enableExporting;
+
+        // UI
+        private VisualElement _exportAndUploadContainer;
+
+        private Button _cancelUploadButton;
+        private VisualElement _uploadProgressContainer;
+        private ProgressBar _uploadProgressBar;
+        private VisualElement _uploadProgressBarBackground;
+
+        public event Action OnInteractionAvailable;
+        public event Action OnInteractionUnavailable;
+
+        public PackageUploadElement(IWorkflow workflow, bool exposeExportButton)
+        {
+            _workflow = workflow;
+            _enableExporting = exposeExportButton;
+
+            Create();
+        }
+
+        private void Create()
+        {
+            AddToClassList("uploading-box");
+
+            CreateButtonContainer();
+            CreateProgressContainer();
+        }
+
+        private void CreateButtonContainer()
+        {
+            _exportAndUploadContainer = new VisualElement();
+            _exportAndUploadContainer.AddToClassList("uploading-export-and-upload-container");
+
+            CreateExportButton();
+            CreateUploadButton();
+            Add(_exportAndUploadContainer);
+        }
+
+        private void CreateExportButton()
+        {
+            if (!_enableExporting)
+                return;
+
+            var _exportAndUploadButton = new Button(async () => await Export(true)) { name = "ExportButton", text = "Export" };
+            _exportAndUploadButton.AddToClassList("uploading-export-button");
+
+            _exportAndUploadContainer.Add(_exportAndUploadButton);
+        }
+
+        private void CreateUploadButton()
+        {
+            var _uploadButton = new Button(Upload) { name = "UploadButton" };
+            _uploadButton.text = _enableExporting ? "Export and Upload" : "Upload";
+            _uploadButton.AddToClassList("uploading-upload-button");
+
+            _exportAndUploadContainer.Add(_uploadButton);
+        }
+
+        private void CreateProgressContainer()
+        {
+            _uploadProgressContainer = new VisualElement();
+            _uploadProgressContainer.AddToClassList("uploading-progress-container");
+            _uploadProgressContainer.style.display = DisplayStyle.None;
+
+            _uploadProgressBar = new ProgressBar { name = "UploadProgressBar" };
+            _uploadProgressBar.AddToClassList("uploading-progress-bar");
+            _uploadProgressBarBackground = _uploadProgressBar.Q<VisualElement>(className: "unity-progress-bar__progress");
+
+            _cancelUploadButton = new Button() { name = "CancelButton", text = "Cancel" };
+            _cancelUploadButton.AddToClassList("uploading-cancel-button");
+
+            _uploadProgressContainer.Add(_uploadProgressBar);
+            _uploadProgressContainer.Add(_cancelUploadButton);
+
+            Add(_uploadProgressContainer);
+        }
+
+        private async Task<PackageExporterResult> Export(bool interactive)
+        {
+            try
+            {
+                DisableInteraction();
+
+                if (!_workflow.IsPathSet)
+                {
+                    EditorUtility.DisplayDialog("Exporting failed", "No path was selected. Please " +
+                        "select a path and try again.", "OK");
+                    return new PackageExporterResult() { Success = false, Exception = new Exception("No path was selected.") };
+                }
+
+                var rootProjectPath = Constants.RootProjectPath;
+                var packageNameStripped = Regex.Replace(_workflow.PackageName, "[^a-zA-Z0-9]", "");
+                var outputName = $"{packageNameStripped}-{DateTime.Now:yyyy-dd-M--HH-mm-ss}";
+
+                string outputPath;
+                if (interactive)
+                {
+                    outputPath = EditorUtility.SaveFilePanel("Export Package", rootProjectPath,
+                        outputName, _workflow.PackageExtension.Remove(0, 1)); // Ignoring the '.' character since SaveFilePanel already appends it
+
+                    if (string.IsNullOrEmpty(outputPath))
+                        return new PackageExporterResult() { Success = false, Exception = null };
+                }
+                else
+                {
+                    outputPath = $"Temp/{outputName}{_workflow.PackageExtension}";
+                }
+
+                var exportResult = await _workflow.ExportPackage(outputPath);
+                if (!exportResult.Success)
+                {
+                    Debug.LogError($"Package exporting failed: {exportResult.Exception}");
+                    EditorUtility.DisplayDialog("Exporting failed", exportResult.Exception.Message, "OK");
+                }
+                else if (interactive)
+                    Debug.Log($"Package exported to '{Path.GetFullPath(exportResult.ExportedPath).Replace("\\", "/")}'");
+
+                return exportResult;
+            }
+            finally
+            {
+                if (interactive)
+                    EnableInteraction();
+            }
+        }
+
+        private async void Upload()
+        {
+            DisableInteraction();
+
+            if (await ValidateUnityVersionsBeforeUpload() == false)
+            {
+                EnableInteraction();
+                return;
+            }
+
+            var exportResult = await Export(false);
+            if (!exportResult.Success)
+            {
+                EnableInteraction();
+                return;
+            }
+
+            if (!_workflow.IsPathSet)
+            {
+                EditorUtility.DisplayDialog("Uploading failed", "No path was selected. Please " +
+                    "select a path and try again.", "OK");
+                EnableInteraction();
+                return;
+            }
+
+            _exportAndUploadContainer.style.display = DisplayStyle.None;
+            _uploadProgressContainer.style.display = DisplayStyle.Flex;
+
+            _cancelUploadButton.clicked += Cancel;
+            _workflow.OnUploadStateChanged += UpdateProgressBar;
+            var response = await _workflow.UploadPackage(exportResult.ExportedPath);
+            _workflow.OnUploadStateChanged -= UpdateProgressBar;
+
+            await OnUploadingStopped(response);
+        }
+
+        private async Task<bool> ValidateUnityVersionsBeforeUpload()
+        {
+            var validationEnabled = ASToolsPreferences.Instance.UploadVersionCheck;
+            if (!validationEnabled)
+                return true;
+
+            var requiredVersionUploaded = await _workflow.ValidatePackageUploadedVersions();
+            if (requiredVersionUploaded)
+                return true;
+
+            var result = EditorUtility.DisplayDialogComplex("Asset Store Tools", $"You may upload this package, but you will need to add a package using Unity version {Constants.Uploader.MinRequiredUnitySupportVersion} " +
+                "or higher to be able to submit a new asset", "Upload", "Cancel", "Upload and do not display this again");
+
+            switch (result)
+            {
+                case 1:
+                    return false;
+                case 2:
+                    ASToolsPreferences.Instance.UploadVersionCheck = false;
+                    ASToolsPreferences.Instance.Save();
+                    break;
+            }
+
+            return true;
+        }
+
+        private void UpdateProgressBar(UploadStatus? status, float? progress)
+        {
+            if (status != null)
+            {
+                _uploadProgressBarBackground.style.backgroundColor = GetColorByStatus(status.Value);
+            }
+
+            if (progress != null)
+            {
+                _uploadProgressBar.value = progress.Value;
+                _uploadProgressBar.title = $"{progress.Value:0.#}%";
+
+                if (progress == 100f && _cancelUploadButton.enabledInHierarchy)
+                    _cancelUploadButton.SetEnabled(false);
+            }
+        }
+
+        private void Cancel()
+        {
+            _cancelUploadButton.SetEnabled(false);
+            _workflow.AbortUpload();
+        }
+
+        private async Task OnUploadingStopped(PackageUploadResponse response)
+        {
+            if (!response.Success && !response.Cancelled)
+            {
+                Debug.LogException(response.Exception);
+            }
+
+            if (response.Success)
+            {
+                await _workflow.RefreshPackage();
+            }
+
+            if (response.Status == UploadStatus.ResponseTimeout)
+            {
+                Debug.LogWarning($"All bytes for the package '{_workflow.PackageName}' have been uploaded, but a response " +
+                        $"from the server was not received. This can happen because of Firewall restrictions. " +
+                        $"Please make sure that a new version of your package has reached the Publishing Portal.");
+            }
+
+            _uploadProgressBar.title = GetProgressBarTitleByStatus(response.Status);
+
+            _cancelUploadButton.clickable = null;
+            _cancelUploadButton.clicked += Reset;
+            _cancelUploadButton.text = "Done";
+            _cancelUploadButton.SetEnabled(true);
+        }
+
+        private void Reset()
+        {
+            _cancelUploadButton.clickable = null;
+            _cancelUploadButton.text = "Cancel";
+
+            _workflow.ResetUploadStatus();
+            UpdateProgressBar(UploadStatus.Default, 0f);
+
+            _uploadProgressContainer.style.display = DisplayStyle.None;
+            _exportAndUploadContainer.style.display = DisplayStyle.Flex;
+            EnableInteraction();
+        }
+
+        public static Color GetColorByStatus(UploadStatus status)
+        {
+            switch (status)
+            {
+                default:
+                case UploadStatus.Default:
+                    return new Color(0.13f, 0.59f, 0.95f);
+                case UploadStatus.Success:
+                case UploadStatus.ResponseTimeout:
+                    return new Color(0f, 0.50f, 0.14f);
+                case UploadStatus.Cancelled:
+                    return new Color(0.78f, 0.59f, 0f);
+                case UploadStatus.Fail:
+                    return new Color(0.69f, 0.04f, 0.04f);
+            }
+        }
+
+        private string GetProgressBarTitleByStatus(UploadStatus status)
+        {
+            var progressBarTitle = "Upload: ";
+            switch (status)
+            {
+                case UploadStatus.ResponseTimeout:
+                    progressBarTitle += UploadStatus.Success;
+                    break;
+                default:
+                    progressBarTitle += status;
+                    break;
+            }
+
+            return progressBarTitle;
+        }
+
+        private void EnableInteraction()
+        {
+            _exportAndUploadContainer.SetEnabled(true);
+            OnInteractionAvailable?.Invoke();
+        }
+
+        private void DisableInteraction()
+        {
+            _exportAndUploadContainer.SetEnabled(false);
+            OnInteractionUnavailable?.Invoke();
+            SetEnabled(true);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageUploadElement.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageUploadElement.cs.meta
new file mode 100644
index 0000000..8fed4c2
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageUploadElement.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 242524e968bd4484eaeb154d8013f427
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PackageUploadElement.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PathSelectionElement.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PathSelectionElement.cs
new file mode 100644
index 0000000..1f96659
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PathSelectionElement.cs
@@ -0,0 +1,63 @@
+using System;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Uploader.UI.Elements
+{
+    internal class PathSelectionElement : VisualElement
+    {
+        // Data
+        private string _labelText;
+        private string _labelTooltip;
+
+        public event Action OnBrowse;
+
+        // UI
+        private TextField _pathSelectionTextField;
+
+        public PathSelectionElement(string labelText, string labelTooltip)
+        {
+            AddToClassList("package-content-option-box");
+
+            _labelText = labelText;
+            _labelTooltip = labelTooltip;
+
+            Create();
+        }
+
+        private void Create()
+        {
+            VisualElement labelHelpRow = new VisualElement();
+            labelHelpRow.AddToClassList("package-content-option-label-help-row");
+
+            Label folderPathLabel = new Label { text = _labelText };
+            Image folderPathLabelTooltip = new Image
+            {
+                tooltip = _labelTooltip
+            };
+
+            labelHelpRow.Add(folderPathLabel);
+            labelHelpRow.Add(folderPathLabelTooltip);
+
+            _pathSelectionTextField = new TextField();
+            _pathSelectionTextField.AddToClassList("package-content-option-textfield");
+            _pathSelectionTextField.isReadOnly = true;
+
+            Button browsePathButton = new Button(Browse) { name = "BrowsePathButton", text = "Browse" };
+            browsePathButton.AddToClassList("package-content-option-button");
+
+            Add(labelHelpRow);
+            Add(_pathSelectionTextField);
+            Add(browsePathButton);
+        }
+
+        private void Browse()
+        {
+            OnBrowse?.Invoke();
+        }
+
+        public void SetPath(string path)
+        {
+            _pathSelectionTextField.value = path;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PathSelectionElement.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PathSelectionElement.cs.meta
new file mode 100644
index 0000000..22dc5e7
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PathSelectionElement.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 753d4442293e5cc4b9efcab089da4d59
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PathSelectionElement.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PreviewGenerationElement.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PreviewGenerationElement.cs
new file mode 100644
index 0000000..183fdd1
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PreviewGenerationElement.cs
@@ -0,0 +1,109 @@
+using AssetStoreTools.Previews.Data;
+using AssetStoreTools.Uploader.Data;
+using System.Linq;
+using UnityEditor;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Uploader.UI.Elements
+{
+    internal class PreviewGenerationElement : VisualElement
+    {
+        // Data
+        private IWorkflow _workflow;
+
+        // UI
+        private VisualElement _toggleRow;
+        private Toggle _previewToggle;
+
+        private VisualElement _buttonRow;
+        private VisualElement _viewButton;
+
+        public PreviewGenerationElement(IWorkflow workflow)
+        {
+            _workflow = workflow;
+
+            Create();
+        }
+
+        private void Create()
+        {
+            CreateInfoRow();
+            CreateViewButton();
+        }
+
+        private void CreateInfoRow()
+        {
+            _toggleRow = new VisualElement();
+            _toggleRow.AddToClassList("package-content-option-box");
+
+            VisualElement toggleLabelHelpRow = new VisualElement();
+            toggleLabelHelpRow.AddToClassList("package-content-option-label-help-row");
+
+            Label toggleLabel = new Label { text = "Asset Previews" };
+            Image toggleLabelTooltip = new Image
+            {
+                tooltip = "Select how the previews for your assets will be generated.\n\n" +
+                "Unity generates asset preview images natively up to a size of 128x128. " +
+                "You can try generating previews which are of higher resolution, up to 300x300.\n\n" +
+                "Note: these asset preview images will only be displayed in the 'Package Content' section of the " +
+                "Asset Store listing page once the package is published, and in the package importer window that appears during the package import process.\n" +
+                "They will not replace the images used for the assets in the Project window after the package gets imported."
+            };
+
+            _previewToggle = new Toggle { name = "PreviewToggle", text = "Generate Hi-Res (experimental)" };
+            _previewToggle.AddToClassList("package-content-option-toggle");
+            _previewToggle.RegisterValueChangedCallback((_) => DependencyToggleValueChange());
+
+            toggleLabelHelpRow.Add(toggleLabel);
+            toggleLabelHelpRow.Add(toggleLabelTooltip);
+
+            _toggleRow.Add(toggleLabelHelpRow);
+            _toggleRow.Add(_previewToggle);
+
+            Add(_toggleRow);
+        }
+
+        private void CreateViewButton()
+        {
+            _buttonRow = new VisualElement();
+            _buttonRow.AddToClassList("package-content-option-box");
+            _buttonRow.style.display = DisplayStyle.None;
+
+            var spaceFiller = new VisualElement();
+            spaceFiller.AddToClassList("package-content-option-label-help-row");
+
+            _viewButton = new Button(ViewClicked) { text = "Inspect Previews" };
+
+            _buttonRow.Add(spaceFiller);
+            _buttonRow.Add(_viewButton);
+
+            Add(_buttonRow);
+        }
+
+        private void DependencyToggleValueChange()
+        {
+            _workflow.GenerateHighQualityPreviews = _previewToggle.value;
+            _buttonRow.style.display = _previewToggle.value ? DisplayStyle.Flex : DisplayStyle.None;
+        }
+
+        private void ViewClicked()
+        {
+            PreviewGenerationSettings settings;
+            if (_workflow.GenerateHighQualityPreviews)
+            {
+                settings = new CustomPreviewGenerationSettings() { InputPaths = _workflow.GetAllPaths().ToArray() };
+            }
+            else
+            {
+                settings = new NativePreviewGenerationSettings() { InputPaths = _workflow.GetAllPaths().ToArray() };
+            }
+
+            AssetStoreTools.ShowAssetStoreToolsPreviewGenerator(settings);
+        }
+
+        private void DisplayProgress(float value)
+        {
+            EditorUtility.DisplayProgressBar("Generating", "Generating previews...", value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PreviewGenerationElement.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PreviewGenerationElement.cs.meta
new file mode 100644
index 0000000..2d303ac
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PreviewGenerationElement.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 54c7971e2ad639644936d3552b4f4f49
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/PreviewGenerationElement.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/UnityPackageWorkflowElement.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/UnityPackageWorkflowElement.cs
new file mode 100644
index 0000000..b8f3d8b
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/UnityPackageWorkflowElement.cs
@@ -0,0 +1,58 @@
+using AssetStoreTools.Uploader.Data;
+using AssetStoreTools.Utility;
+using UnityEditor;
+
+namespace AssetStoreTools.Uploader.UI.Elements
+{
+    internal class UnityPackageWorkflowElement : WorkflowElementBase
+    {
+        // Data
+        private UnityPackageWorkflow _workflow;
+
+        public UnityPackageWorkflowElement(UnityPackageWorkflow workflow) : base(workflow)
+        {
+            _workflow = workflow;
+            Create();
+        }
+
+        private void Create()
+        {
+            CreatePathElement("Package path", "Select the .unitypackage file you would like to upload.");
+            CreateValidationElement(new ExternalProjectValidationElement(_workflow));
+            CreateUploadElement(_workflow, false);
+            Deserialize();
+        }
+
+        protected override void BrowsePath()
+        {
+            // Path retrieval
+            var absolutePackagePath = EditorUtility.OpenFilePanel("Select a .unitypackage file", Constants.RootProjectPath, "unitypackage");
+
+            if (string.IsNullOrEmpty(absolutePackagePath))
+                return;
+
+            var relativeExportPath = FileUtility.AbsolutePathToRelativePath(absolutePackagePath, ASToolsPreferences.Instance.EnableSymlinkSupport);
+            if (!_workflow.IsPathValid(relativeExportPath, out var error))
+            {
+                EditorUtility.DisplayDialog("Invalid selection", error, "OK");
+                return;
+            }
+
+            HandleUnityPackageUploadPathSelection(relativeExportPath, true);
+        }
+
+        private void HandleUnityPackageUploadPathSelection(string selectedPackagePath, bool serialize)
+        {
+            if (string.IsNullOrEmpty(selectedPackagePath))
+                return;
+
+            _workflow.SetPackagePath(selectedPackagePath, serialize);
+            SetPathSelectionTextField(selectedPackagePath);
+        }
+
+        protected override void Deserialize()
+        {
+            HandleUnityPackageUploadPathSelection(_workflow.GetPackagePath(), false);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/UnityPackageWorkflowElement.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/UnityPackageWorkflowElement.cs.meta
new file mode 100644
index 0000000..d599e1e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/UnityPackageWorkflowElement.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 7a0c8a79b7dba9e458ddc54eec30ea66
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Elements/UnityPackageWorkflowElement.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Views.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Views.meta
new file mode 100644
index 0000000..e5882f0
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Views.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7511d6ab930f33c469562bc3c1c2aab2
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Views/LoginView.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Views/LoginView.cs
new file mode 100644
index 0000000..b7869c3
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Views/LoginView.cs
@@ -0,0 +1,284 @@
+using AssetStoreTools.Api.Models;
+using AssetStoreTools.Uploader.Services.Api;
+using AssetStoreTools.Utility;
+using System;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Uploader.UI.Views
+{
+    internal class LoginView : VisualElement
+    {
+        // Data
+        private IAuthenticationService _authenticationService;
+        private double _cloudLoginRefreshTime = 1d;
+        private double _lastRefreshTime;
+
+        // UI
+        private Button _cloudLoginButton;
+        private Label _cloudLoginLabel;
+
+        private Box _errorBox;
+        private Label _errorLabel;
+
+        private TextField _emailField;
+        private TextField _passwordField;
+        private Button _credentialsLoginButton;
+
+        public event Action<User> OnAuthenticated;
+
+        public LoginView(IAuthenticationService authenticationService)
+        {
+            _authenticationService = authenticationService;
+            Create();
+        }
+
+        public void Create()
+        {
+            styleSheets.Add(StyleSelector.UploaderWindow.LoginViewStyle);
+            styleSheets.Add(StyleSelector.UploaderWindow.LoginViewTheme);
+
+            CreateAssetStoreLogo();
+            CreateCloudLogin();
+            CreateErrorBox();
+            CreateCredentialsLogin();
+        }
+
+        private void CreateAssetStoreLogo()
+        {
+            // Asset Store logo
+            Image assetStoreLogo = new Image { name = "AssetStoreLogo" };
+            assetStoreLogo.AddToClassList("asset-store-logo");
+
+            Add(assetStoreLogo);
+        }
+
+        private void CreateCloudLogin()
+        {
+            VisualElement cloudLogin = new VisualElement { name = "CloudLogin" };
+
+            _cloudLoginButton = new Button(LoginWithCloudToken) { name = "LoginButtonCloud" };
+            _cloudLoginButton.AddToClassList("cloud-button-login");
+            _cloudLoginButton.SetEnabled(false);
+
+            _cloudLoginLabel = new Label { text = "Cloud login unavailable" };
+            _cloudLoginLabel.AddToClassList("cloud-button-login-label");
+
+            Label orLabel = new Label { text = "or" };
+            orLabel.AddToClassList("cloud-label-or");
+
+            _cloudLoginButton.Add(_cloudLoginLabel);
+
+            cloudLogin.Add(_cloudLoginButton);
+            cloudLogin.Add(orLabel);
+
+            UpdateCloudLoginButton();
+            EditorApplication.update += UpdateCloudLoginButton;
+            Add(cloudLogin);
+        }
+
+        private void CreateErrorBox()
+        {
+            _errorBox = new Box() { name = "LoginErrorBox" };
+            _errorBox.AddToClassList("error-container");
+            _errorBox.style.display = DisplayStyle.None;
+
+            var errorImage = new Image();
+            _errorBox.Add(errorImage);
+
+            _errorLabel = new Label();
+            _errorBox.Add(_errorLabel);
+
+            Add(_errorBox);
+        }
+
+        public void DisplayError(string message)
+        {
+            if (string.IsNullOrEmpty(message))
+                return;
+
+            _errorLabel.text = message;
+            Debug.LogError(message);
+
+            _errorBox.style.display = DisplayStyle.Flex;
+        }
+
+        private void ClearError()
+        {
+            _errorLabel.text = string.Empty;
+            _errorBox.style.display = DisplayStyle.None;
+        }
+
+        private void CreateCredentialsLogin()
+        {
+            // Manual login
+            VisualElement manualLoginBox = new VisualElement { name = "ManualLoginBox" };
+            manualLoginBox.AddToClassList("credentials-container");
+
+            // Email input box
+            VisualElement inputBoxEmail = new VisualElement();
+            inputBoxEmail.AddToClassList("credentials-input-container");
+
+            Label emailTitle = new Label { text = "Email" };
+            _emailField = new TextField();
+
+            inputBoxEmail.Add(emailTitle);
+            inputBoxEmail.Add(_emailField);
+
+            manualLoginBox.Add(inputBoxEmail);
+
+            // Password input box
+            VisualElement inputBoxPassword = new VisualElement();
+            inputBoxPassword.AddToClassList("credentials-input-container");
+
+            Label passwordTitle = new Label { text = "Password" };
+            _passwordField = new TextField { isPasswordField = true };
+
+            inputBoxPassword.Add(passwordTitle);
+            inputBoxPassword.Add(_passwordField);
+
+            manualLoginBox.Add(inputBoxPassword);
+
+            // Login button
+            _credentialsLoginButton = new Button(LoginWithCredentials) { name = "LoginButtonCredentials" };
+            _credentialsLoginButton.AddToClassList("credentials-button-login");
+
+            Label loginDescriptionCredentials = new Label { text = "Login" };
+            loginDescriptionCredentials.AddToClassList("credentials-button-login-label");
+
+            _credentialsLoginButton.Add(loginDescriptionCredentials);
+
+            manualLoginBox.Add(_credentialsLoginButton);
+
+            Add(manualLoginBox);
+
+            // Credentials login helpers
+            VisualElement helperBox = new VisualElement { name = "HelperBox" };
+            helperBox.AddToClassList("help-section-container");
+
+            Button createAccountButton = new Button { name = "CreateAccountButton", text = "Create Publisher ID" };
+            Button forgotPasswordButton = new Button { name = "ForgotPasswordButton", text = "Reset Password" };
+
+            createAccountButton.AddToClassList("help-section-hyperlink-button");
+            forgotPasswordButton.AddToClassList("help-section-hyperlink-button");
+
+            createAccountButton.clicked += () => Application.OpenURL(Constants.Uploader.AccountRegistrationUrl);
+            forgotPasswordButton.clicked += () => Application.OpenURL(Constants.Uploader.AccountForgottenPasswordUrl);
+
+            helperBox.Add(createAccountButton);
+            helperBox.Add(forgotPasswordButton);
+
+            Add(helperBox);
+        }
+
+        public async void LoginWithSessionToken()
+        {
+            ASDebug.Log("Authenticating with session token...");
+            ClearError();
+            SetEnabled(false);
+
+            var result = await _authenticationService.AuthenticateWithSessionToken();
+            if (!result.Success)
+            {
+                // Session authentication fail does not display errors in the UI
+                ASDebug.Log("No existing session was found");
+                SetEnabled(true);
+                return;
+            }
+
+            OnLoginSuccess(result.User);
+        }
+
+        private async void LoginWithCloudToken()
+        {
+            ASDebug.Log("Authenticating with cloud token...");
+            ClearError();
+            SetEnabled(false);
+
+            var result = await _authenticationService.AuthenticateWithCloudToken();
+            if (!result.Success)
+            {
+                OnLoginFail(result.Exception.Message);
+                return;
+            }
+
+            OnLoginSuccess(result.User);
+        }
+
+        private async void LoginWithCredentials()
+        {
+            ASDebug.Log("Authenticating with credentials...");
+            ClearError();
+            var isValid = IsLoginDataValid(_emailField.text, _passwordField.value);
+            SetEnabled(!isValid);
+
+            if (!isValid)
+                return;
+
+            var result = await _authenticationService.AuthenticateWithCredentials(_emailField.text, _passwordField.text);
+            if (result.Success)
+                OnLoginSuccess(result.User);
+            else
+                OnLoginFail(result.Exception.Message);
+        }
+
+        private bool IsLoginDataValid(string email, string password)
+        {
+            if (string.IsNullOrEmpty(email))
+            {
+                DisplayError("Email field cannot be empty.");
+                return false;
+            }
+
+            if (string.IsNullOrEmpty(password))
+            {
+                DisplayError("Password field cannot be empty.");
+                return false;
+            }
+
+            return true;
+        }
+
+        private void UpdateCloudLoginButton()
+        {
+            if (_cloudLoginLabel == null)
+                return;
+
+            if (_lastRefreshTime + _cloudLoginRefreshTime > EditorApplication.timeSinceStartup)
+                return;
+
+            _lastRefreshTime = EditorApplication.timeSinceStartup;
+
+            // Cloud login
+            if (_authenticationService.CloudAuthenticationAvailable(out var username, out var _))
+            {
+                _cloudLoginLabel.text = $"Login as {username}";
+                _cloudLoginButton.SetEnabled(true);
+            }
+            else
+            {
+                _cloudLoginLabel.text = "Cloud login unavailable";
+                _cloudLoginButton.SetEnabled(false);
+            }
+        }
+
+        private void OnLoginSuccess(User user)
+        {
+            ASDebug.Log($"Successfully authenticated as {user.Username}\n{user}");
+
+            _emailField.value = string.Empty;
+            _passwordField.value = string.Empty;
+
+            OnAuthenticated?.Invoke(user);
+            SetEnabled(true);
+        }
+
+        private void OnLoginFail(string message)
+        {
+            ASDebug.LogError($"Authentication failed: {message}");
+            DisplayError(message);
+            SetEnabled(true);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Views/LoginView.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Views/LoginView.cs.meta
new file mode 100644
index 0000000..394be9b
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Views/LoginView.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: e20b8602a9bd8ca48a5689b3f32cdd90
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Views/LoginView.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Views/PackageListView.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Views/PackageListView.cs
new file mode 100644
index 0000000..762e0ec
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Views/PackageListView.cs
@@ -0,0 +1,249 @@
+using AssetStoreTools.Uploader.Data;
+using AssetStoreTools.Uploader.Services;
+using AssetStoreTools.Uploader.Services.Api;
+using AssetStoreTools.Uploader.UI.Elements;
+using AssetStoreTools.Utility;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using UnityEditor;
+using UnityEditor.SceneManagement;
+using UnityEngine.SceneManagement;
+using UnityEngine.UIElements;
+using PackageModel = AssetStoreTools.Api.Models.Package;
+
+namespace AssetStoreTools.Uploader.UI.Views
+{
+    internal class PackageListView : VisualElement
+    {
+        // Data
+        private List<IPackage> _packages;
+        private readonly string[] _priorityGroupNames = { "draft", "published" };
+
+        private IPackageDownloadingService _packageDownloadingService;
+        private IPackageFactoryService _packageFactory;
+
+        // UI
+        private LoadingSpinner _loadingSpinner;
+        private ScrollView _packageScrollView;
+        private PackageListToolbar _packageListToolbar;
+
+        public event Action<Exception> OnInitializeError;
+
+        public PackageListView(IPackageDownloadingService packageDownloadingService, IPackageFactoryService elementFactory)
+        {
+            _packages = new List<IPackage>();
+            _packageDownloadingService = packageDownloadingService;
+            _packageFactory = elementFactory;
+
+            Create();
+            EditorSceneManager.activeSceneChangedInEditMode += OnSceneChange;
+        }
+
+        private void Create()
+        {
+            styleSheets.Add(StyleSelector.UploaderWindow.PackageListViewStyle);
+            styleSheets.Add(StyleSelector.UploaderWindow.PackageListViewTheme);
+
+            AddToClassList("package-list-view");
+
+            CreateFilteringTools();
+            CreateLoadingSpinner();
+            CreateScrollView();
+
+            ShowPackagesView();
+        }
+
+        private void CreateScrollView()
+        {
+            _packageScrollView = new ScrollView();
+            Add(_packageScrollView);
+        }
+
+        private void CreateFilteringTools()
+        {
+            _packageListToolbar = new PackageListToolbar();
+            Add(_packageListToolbar);
+        }
+
+        private void CreateLoadingSpinner()
+        {
+            _loadingSpinner = new LoadingSpinner();
+            Add(_loadingSpinner);
+        }
+
+        private void InsertReadOnlyInfoBox(string infoText)
+        {
+            var groupHeader = new Box { name = "GroupReadOnlyInfoBox" };
+            groupHeader.AddToClassList("package-group-info-box");
+
+            var infoImage = new Image();
+            groupHeader.Add(infoImage);
+
+            var infoLabel = new Label { text = infoText };
+            groupHeader.Add(infoLabel);
+
+            _packageScrollView.Add(groupHeader);
+        }
+
+        public async Task LoadPackages(bool useCachedData)
+        {
+            _packages.Clear();
+            _packageScrollView.Clear();
+            _packageListToolbar.SetEnabled(false);
+
+            if (!useCachedData)
+            {
+                _packageDownloadingService.ClearPackageData();
+            }
+
+            _loadingSpinner.Show();
+            await Task.Delay(100);
+
+            try
+            {
+                var response = await _packageDownloadingService.GetPackageData();
+
+                if (response.Cancelled)
+                {
+                    ASDebug.Log("Package retrieval was cancelled");
+                    return;
+                }
+
+                if (!response.Success)
+                {
+                    ASDebug.LogError(response.Exception);
+                    OnInitializeError?.Invoke(response.Exception);
+                    return;
+                }
+
+                var packageModels = response.Packages;
+                ASDebug.Log($"Found {packageModels.Count} packages");
+
+                if (packageModels.Count == 0)
+                {
+                    InsertReadOnlyInfoBox("You do not have any packages yet. Please visit the Publishing Portal if you " +
+                        "would like to create one.");
+                    return;
+                }
+
+                // Create package groups
+                _packages = CreatePackages(packageModels);
+                var packageGroups = CreatePackageGroups(_packages);
+                var packageGroupElements = CreatePackageGroupElements(packageGroups);
+                PopulatePackageList(packageGroupElements);
+
+                // Setup filtering and thumbnails
+                SetupFilteringToolbar(packageGroups);
+                DownloadAndSetThumbnails();
+            }
+            finally
+            {
+                _loadingSpinner.Hide();
+            }
+        }
+
+        private List<IPackage> CreatePackages(List<PackageModel> packageModels)
+        {
+            return _packages = packageModels.Select(x => _packageFactory.CreatePackage(x)).ToList();
+        }
+
+        private List<IPackageGroup> CreatePackageGroups(List<IPackage> packages)
+        {
+            var packageGroups = new List<IPackageGroup>();
+            var packagesByStatus = packages.GroupBy(x => x.Status).ToDictionary(x => x.Key, x => x.ToList());
+
+            foreach (var kvp in packagesByStatus)
+            {
+                var groupName = char.ToUpper(kvp.Key[0]) + kvp.Key.Substring(1);
+                var groupPackages = kvp.Value;
+                var packageGroup = _packageFactory.CreatePackageGroup(groupName, groupPackages);
+                packageGroups.Add(packageGroup);
+            }
+
+            return packageGroups;
+        }
+
+        private List<PackageGroupElement> CreatePackageGroupElements(List<IPackageGroup> packageGroups)
+        {
+            var elements = new List<PackageGroupElement>();
+            foreach (var packageGroup in packageGroups)
+                elements.Add(new PackageGroupElement(packageGroup, _packageFactory));
+
+            return elements;
+        }
+
+        private void PopulatePackageList(List<PackageGroupElement> packageGroups)
+        {
+            // Draft group
+            var draftGroup = packageGroups.FirstOrDefault(x => x.Name.Equals("draft", StringComparison.OrdinalIgnoreCase));
+            if (draftGroup != null)
+            {
+                draftGroup.Toggle(true);
+                _packageScrollView.Add(draftGroup);
+            }
+
+            // Infobox will only be shown if:
+            // 1) There is more than 1 group OR
+            // 2) There is only 1 group, but it is not draft
+            var showInfoBox = packageGroups.Count > 1
+                || packageGroups.Count == 1 && !packageGroups[0].Name.Equals("draft", StringComparison.OrdinalIgnoreCase);
+
+            if (showInfoBox)
+                InsertReadOnlyInfoBox("Only packages with a 'Draft' status can be selected for uploading Assets");
+
+            // Priority groups
+            foreach (var priorityName in _priorityGroupNames)
+            {
+                var priorityGroup = packageGroups.FirstOrDefault(x => x.Name.Equals(priorityName, StringComparison.OrdinalIgnoreCase));
+                if (priorityGroup == null || _packageScrollView.Contains(priorityGroup))
+                    continue;
+
+                _packageScrollView.Add(priorityGroup);
+            }
+
+            // The rest
+            foreach (var group in packageGroups)
+            {
+                if (!_packageScrollView.Contains(group))
+                    _packageScrollView.Add(group);
+            }
+        }
+
+        private void SetupFilteringToolbar(List<IPackageGroup> packageGroups)
+        {
+            _packageListToolbar.SetPackageGroups(packageGroups);
+            _packageListToolbar.Sort(PackageSorting.Name);
+            _packageListToolbar.SetEnabled(true);
+        }
+
+        private void DownloadAndSetThumbnails()
+        {
+            foreach (var package in _packages)
+            {
+                DownloadAndSetThumbnail(package);
+            }
+        }
+
+        private async void DownloadAndSetThumbnail(IPackage package)
+        {
+            var response = await _packageDownloadingService.GetPackageThumbnail(package);
+            if (!response.Success)
+                return;
+
+            package.UpdateIcon(response.Thumbnail);
+        }
+
+        private void ShowPackagesView()
+        {
+            _packageScrollView.style.display = DisplayStyle.Flex;
+            _packageListToolbar.style.display = DisplayStyle.Flex;
+        }
+
+        private void OnSceneChange(Scene _, Scene __)
+        {
+            DownloadAndSetThumbnails();
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Views/PackageListView.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Views/PackageListView.cs.meta
new file mode 100644
index 0000000..43e9178
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Views/PackageListView.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 3c499c2d0a5e8fd4b9984184c59893e7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Scripts/UI/Views/PackageListView.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles.meta
new file mode 100644
index 0000000..6040ca4
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f9398c14296d30f479b9de5f3ec3b827
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/LoginView.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/LoginView.meta
new file mode 100644
index 0000000..03dac6e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/LoginView.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7564d91cabdce1344ba4a0fca25e13d5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/LoginView/Style.uss b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/LoginView/Style.uss
new file mode 100644
index 0000000..299ff2e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/LoginView/Style.uss
@@ -0,0 +1,134 @@
+/* Logo */
+
+.asset-store-logo {
+    width: 90%;
+    height: 32px;
+
+    align-self: center;
+    
+    margin: 40px 0;
+
+    -unity-background-scale-mode: scale-to-fit;
+}
+
+/* Cloud Login */
+
+.cloud-button-login {
+    align-self: center;
+
+    width: 75%;
+}
+
+.cloud-button-login-label {
+    -unity-text-align: middle-center;
+    white-space: normal;
+
+    min-height: 24px;
+    padding-right: 4px;
+}
+
+.cloud-label-or {
+    align-self: center;
+
+    -unity-text-align: middle-center;
+
+    margin: 10px 0;
+}
+
+/* Error Section */
+
+.error-container {
+    flex-direction: row;
+    flex-shrink: 0;
+    
+    align-self: center;
+ 
+    min-width: 300px;
+    max-width: 300px;
+
+    margin: 5px 0 5px 1px;
+}
+
+.error-container > Image {
+    flex-direction: row;
+
+    width: 32px;
+    height: 32px;
+    
+    margin: 5px 10px;
+}
+
+.error-container > Label {
+    flex-grow: 1;
+    flex-shrink: 1;
+    
+    -unity-text-align: middle-left;
+    white-space: normal;
+    
+    margin-right: 5px;
+    padding: 2px 0;
+}
+
+/* Credentials Login */
+
+.credentials-container {
+    align-self: center;
+    
+    width: 75%;
+    
+    padding: 15px;
+}
+
+.credentials-input-container {
+    align-self: center;
+
+    width: 100%;
+
+    margin: 5px 0;
+}
+
+.credentials-input-container > Label {
+    -unity-text-align: upper-left;
+    
+    margin: 2px 0;
+}
+
+.credentials-input-container > TextField {
+    height: 20px;
+    margin: 0 1px;
+}
+
+.credentials-button-login {
+    align-self: center;
+
+    width: 100%;
+    margin: 10px 0 15px 0;
+}
+
+.credentials-button-login-label {
+    -unity-text-align: middle-center;
+    white-space: normal;
+
+    min-height: 24px;
+    padding-right: 4px;
+}
+
+/* Help Section */
+
+.help-section-container {
+    flex-direction: row;
+
+    justify-content: space-between;
+    align-self: center;
+    
+    width: 75%;
+    margin: 5px 0;
+}
+
+.help-section-hyperlink-button {
+    margin: 0 10px;
+    padding: 0;
+
+    flex-shrink: 1;
+    white-space: normal;
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/LoginView/Style.uss.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/LoginView/Style.uss.meta
new file mode 100644
index 0000000..91ce4b5
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/LoginView/Style.uss.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 5e05fbdf7dd89a14985a87aa62a03a0e
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/LoginView/Style.uss
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/LoginView/ThemeDark.uss b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/LoginView/ThemeDark.uss
new file mode 100644
index 0000000..372dd2c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/LoginView/ThemeDark.uss
@@ -0,0 +1,44 @@
+/* Logo */
+
+.asset-store-logo {
+    background-image: url("../../Icons/publisher-portal-dark.png");
+}
+
+/* Cloud Login */
+
+.cloud-label-or {
+    color: rgb(200, 200, 200);
+}
+
+/* Error Section */
+
+.error-container {
+    background-color: rgb(63, 63, 63);
+}
+
+.error-container > Image {
+    --unity-image: resource("console.erroricon@2x");
+}
+
+/* Credentials Login */
+
+.credentials-container {
+    background-color: rgb(63, 63, 63);
+}
+
+/* Help Section */
+
+.help-section-hyperlink-button {
+    color: rgb(68, 113, 229);
+    border-color: rgba(0, 0, 0, 0);
+    background-color: rgba(0, 0, 0, 0);
+}
+
+.help-section-hyperlink-button:hover {
+    color: rgb(68, 133, 229);
+    cursor: link;
+}
+
+.help-section-hyperlink-button:active {
+    color: rgb(68, 93, 229);
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/LoginView/ThemeDark.uss.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/LoginView/ThemeDark.uss.meta
new file mode 100644
index 0000000..2beccfd
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/LoginView/ThemeDark.uss.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: bea9503736c358b4e99eac03c0db32b7
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/LoginView/ThemeDark.uss
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/LoginView/ThemeLight.uss b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/LoginView/ThemeLight.uss
new file mode 100644
index 0000000..f4bb757
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/LoginView/ThemeLight.uss
@@ -0,0 +1,44 @@
+/* Logo */
+
+.asset-store-logo {
+    background-image: url("../../Icons/publisher-portal-light.png");
+}
+
+/* Cloud Login */
+
+.cloud-label-or {
+    color: rgb(28, 28, 28);
+}
+
+/* Error Section */
+
+.error-container {
+    background-color: rgb(212, 212, 212);
+}
+
+.error-container > Image {
+    --unity-image: resource("console.erroricon@2x");
+}
+
+/* Credentials Login */
+
+.credentials-container {
+    background-color: rgb(212, 212, 212);
+}
+
+/* Help Section */
+
+.help-section-hyperlink-button {
+    color: rgb(68, 113, 229);
+    border-color: rgba(0, 0, 0, 0);
+    background-color: rgba(0, 0, 0, 0);
+}
+
+.help-section-hyperlink-button:hover {
+    color: rgb(68, 133, 229);
+    cursor: link;
+}
+
+.help-section-hyperlink-button:active {
+    color: rgb(68, 93, 229);
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/LoginView/ThemeLight.uss.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/LoginView/ThemeLight.uss.meta
new file mode 100644
index 0000000..10f17a4
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/LoginView/ThemeLight.uss.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 895ecc4cb6c82b144b8423996c89f7ef
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/LoginView/ThemeLight.uss
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/PackageListView.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/PackageListView.meta
new file mode 100644
index 0000000..f5446fd
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/PackageListView.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 46d44b66f60dc484897f0afeee574dbe
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/PackageListView/Style.uss b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/PackageListView/Style.uss
new file mode 100644
index 0000000..70cb5d6
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/PackageListView/Style.uss
@@ -0,0 +1,485 @@
+.package-list-view {
+    flex-grow: 1;
+}
+
+/* Package List Toolbar */
+
+.package-list-toolbar {
+    flex-direction: row;
+    flex-shrink: 0;
+    
+    justify-content: space-between;
+    
+    height: 24px;
+}
+
+.package-search-field {
+    flex-grow: 1;
+    flex-shrink: 1;
+    align-items: center;
+    
+    margin: 1px;
+}
+
+.package-search-field > #unity-search {
+    margin-top: 0;
+}
+
+.package-search-field > * > .unity-base-field__input {
+    font-size: 12px;
+    
+    padding-left: 5px;
+}
+
+.package-sort-menu {
+    flex-shrink: 0.001;
+    align-self: center;
+
+    height: 21px;
+    
+    margin: 1px;
+    padding: 1px 6px;
+}
+
+/* Loading Spinner  */
+
+.loading-spinner-box
+{
+    flex-grow: 1;
+    flex-shrink: 1;
+    
+    justify-content: center;
+}
+
+.loading-spinner-image {
+    align-self: center;
+    
+    width: 16px;
+    height: 16px;
+}
+
+/* Package Group */
+
+.package-group-expander-box {
+    flex-direction: row;
+    flex-grow: 0;
+    flex-shrink: 0;
+
+    align-items: center;
+
+    min-height: 30px;
+
+    margin: 10px 0 2px 0;
+    padding: 1px 5px;
+}
+
+.package-group-expander
+{
+    align-self: center;
+    
+    width: 30px;
+    height: 30px;
+}
+
+.package-group-label {
+    font-size: 14px;
+    -unity-font-style: bold;
+}
+
+.package-group-content-box {
+    margin: 0;
+}
+
+.package-group-separator {
+    height: 2px;
+    
+    margin: 5px 15px;
+
+    display: none;
+}
+
+.package-group-info-box {
+    flex-direction: row;
+    align-items: center;
+    font-size: 12px;
+    margin: 5px;
+    margin-top: 5px;
+}
+
+.package-group-info-box > Image
+{
+    flex-direction: row;
+    flex-shrink: 0;
+
+    width: 32px;
+    height: 32px;
+
+    margin: 5px 10px;
+}
+
+.package-group-info-box > Label
+{
+    flex-grow: 1;
+    flex-shrink: 1;
+
+    -unity-text-align: middle-left;
+    white-space: normal;
+
+    margin-right: 5px;
+}
+
+/* Package Element */
+
+.package-full-box {
+    flex-direction: column;
+    flex-shrink: 0;
+    flex-grow: 0;
+
+    min-width: 280px;
+}
+
+.package-foldout-box {
+    flex-direction: column;
+    margin: 0;
+}
+
+.package-foldout-box-expanded {
+    padding-top: 3px;
+    top: -2px;
+}
+
+.package-foldout-box-info {
+    flex-direction: row;
+    flex-grow: 0;
+    flex-shrink: 0;
+    
+    align-items: center;
+    justify-content: space-between;
+    
+    min-width: 200px;
+    min-height: 50px;
+
+    margin: 2px;
+}
+
+.package-expander-label-row {
+    flex-basis: 200px;
+    flex-direction: row;
+    flex-grow: 1;
+}
+
+.package-expander {
+    align-self: center;
+    
+    width: 30px;
+    height: 30px;
+}
+
+.package-image {
+    flex-shrink: 0;
+    
+    width: 48px;
+    height: 48px;
+    
+    margin: 0 5px;
+}
+
+.package-label-info-box {
+    flex-direction: column;
+    flex-grow: 1;
+    flex-shrink: 1;
+    
+    align-self: center;
+}
+
+.package-label {
+    flex-shrink: 1;
+    
+    align-self: stretch;
+    
+    -unity-text-align: middle-left;
+    -unity-font-style: bold;
+    white-space: normal;
+}
+
+.package-info {
+    font-size: 11px;
+    -unity-text-align: middle-left;
+    white-space: normal;
+}
+
+.package-open-in-browser-button {
+    flex-shrink: 0;
+
+    width: 16px;
+    height: 16px;
+    
+    -unity-background-scale-mode: scale-to-fit;
+}
+
+.package-header-progress-bar {
+    margin: 0 -6px -1px -6px;
+    padding: 0 0 2px 0;
+}
+
+.package-header-progress-bar > * > .unity-progress-bar__background {
+    height: 5px;
+}
+
+/* Package Content Element & its nested elements */
+
+.package-content-element {
+    flex-grow: 1;
+    flex-shrink: 0;
+
+    overflow: hidden;
+
+    margin: -5px 0px 2px 0px;
+    padding: 5px 10px 5px 40px;
+}
+
+.package-content-option-box {
+    flex-direction: row;
+    
+    margin-top: 10px;
+}
+
+.package-content-option-label-help-row {
+    flex-direction: row;
+    flex-shrink: 0;
+    
+    align-self: flex-start;
+    align-items: center;
+    justify-content: flex-start;
+    
+    width: 115px;
+}
+
+.package-content-option-label-help-row > Label {
+    -unity-text-align: middle-left;
+}
+
+.package-content-option-label-help-row > Image {
+    height: 16px;
+    width: 16px;
+}
+
+.package-content-option-dropdown {
+    flex-grow: 1;
+    flex-shrink: 1;
+    
+    align-self: stretch;
+    
+    margin-right: 0;
+    margin-left: 3px;
+}
+
+.package-content-option-textfield {
+    flex-grow: 1;
+    flex-shrink: 1;
+
+    align-self: stretch;
+}
+
+.package-content-option-button {
+    margin-right: 0;
+}
+
+.package-content-option-toggle {
+    flex-shrink: 1;
+}
+
+.package-content-option-toggle > * {
+    flex-shrink: 1;
+}
+
+.package-content-option-toggle * > .unity-label {
+    flex-shrink: 1;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    margin-left: 5px;
+}
+
+/* MutliToggleSelection Element */
+
+.multi-toggle-box {
+    flex-grow: 1;
+    flex-direction: column;
+}
+
+.multi-toggle-box-scrollview {
+    flex-grow: 1;
+
+    height: 100px;
+    margin-left: 3px;
+}
+
+.multi-toggle-box-scrollview > .unity-scroll-view__content-viewport
+{
+    margin-left: 1px;
+}
+
+.multi-toggle-box-scrollview > * > .unity-scroll-view__content-container
+{
+    padding: 3px 0 5px 0;
+}
+
+.multi-toggle-box-scrollview > * > .unity-scroll-view__vertical-scroller
+{
+    margin: -1px 0;
+}
+
+.multi-toggle-box-empty-label {
+    flex-grow: 1;
+
+    font-size: 11px;
+    -unity-text-align: middle-center;
+    white-space: normal;
+    
+    display: none;
+}
+
+.multi-toggle-box-toolbar {
+    flex-direction: row;
+    margin: -1px 0 0 3px;
+}
+
+.multi-toggle-box-toolbar-selecting-box {
+    flex-grow: 1;
+    flex-shrink: 1;
+    flex-direction: row;
+
+    align-items: center;
+    justify-content: flex-end;
+
+    margin-top: 1px;
+}
+
+.multi-toggle-box-toolbar-selecting-box > Button {
+    flex-shrink: 1;
+    width: 75px;
+    margin-right: 0;
+}
+
+.multi-toggle-box-toolbar-filtering-box {
+    flex-grow: 1;
+    flex-direction: row;
+
+    align-items: center;
+    justify-content: flex-start;
+
+    margin-top: 1px;
+    margin-left: 1px;
+}
+
+.multi-toggle-box-toolbar-filtering-box > ToolbarMenu {
+    width: 100px;
+    margin: 0;
+}
+
+.multi-toggle-box-toggle {
+    padding: 2px 0 0 5px;
+}
+
+.multi-toggle-box-toggle > * > .unity-label {
+    margin-left: 5px;
+}
+
+/* Validation Element */
+
+.validation-result-box {
+    flex-direction: row;
+
+    align-items: center;
+
+    font-size: 12px;
+    
+    margin-top: 5px;
+}
+
+.validation-result-box > Image {
+    flex-direction: row;
+    flex-shrink: 0;
+
+    width: 32px;
+    height: 32px;
+
+    margin: 5px 10px;
+}
+
+.validation-result-box > Label {
+    flex-grow: 1;
+    flex-shrink: 1;
+
+    -unity-text-align: middle-left;
+    white-space: normal;
+
+    margin-right: 5px;
+}
+
+.validation-result-box > Button {
+    margin-right: 10px;
+}
+
+.validation-result-view-report-button-container {
+    flex-shrink: 0;
+    padding: 0 10px 0 10px;
+}
+
+.validation-result-view-report-button {
+    margin: 0;
+    padding: 4px 0 4px 0;
+}
+
+.validation-result-view-report-button:hover {
+    cursor: link;
+}
+
+/* Uploading Element */
+
+.uploading-box {
+    margin-top: 10px;
+}
+
+.uploading-export-and-upload-container {
+    flex-direction: row;
+    flex-wrap: wrap;
+}
+
+.uploading-export-button {
+    flex-basis: 110px;
+    flex-grow: 1;
+    height: 24px;
+    margin: 1px 2px 0 2px;
+}
+
+.uploading-upload-button {
+    flex-basis: 110px;
+    flex-grow: 1;
+    height: 24px;
+    margin: 1px 2px 0 2px;
+}
+
+.uploading-progress-container {
+    flex-direction: row;
+}
+
+.uploading-progress-bar {
+    flex-grow: 1;
+    flex-shrink: 1;
+    
+    justify-content: center;
+
+    padding: 0;
+    margin: 0 10px 0 0;
+}
+
+.uploading-progress-bar > * > .unity-progress-bar__background {
+    height: 22px;
+}
+
+.uploading-cancel-button {
+    width: 95px;
+    height: 24px;
+    margin: 0;
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/PackageListView/Style.uss.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/PackageListView/Style.uss.meta
new file mode 100644
index 0000000..d2610f8
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/PackageListView/Style.uss.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 4b3b52dc166e3e24bb1ce4acd2592f3a
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/PackageListView/Style.uss
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/PackageListView/ThemeDark.uss b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/PackageListView/ThemeDark.uss
new file mode 100644
index 0000000..3321fd7
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/PackageListView/ThemeDark.uss
@@ -0,0 +1,238 @@
+/* Package List Toolbar */
+
+.package-list-toolbar {
+    border-bottom-width: 1px;
+    border-color: rgb(33, 33, 33);
+    
+    background-color: rgb(68, 68, 68);
+}
+
+.package-sort-menu {
+    color: rgb(238, 238, 238);
+    
+    border-width: 1px;
+    border-radius: 3px;
+    border-color: rgb(36, 36, 36);
+    
+    background-color: rgb(88, 88, 88);
+}
+
+.package-sort-menu:hover {
+    background-color: rgb(103, 103, 103);
+}
+
+.package-sort-menu:active {
+    background-color: rgb(73, 73, 73);
+}
+
+/* Loading Spinner  */
+
+.loading-spinner-image {
+    --unity-image: resource("WaitSpin00");
+}
+
+/* Package Group */
+
+.package-group-expander-box {
+    border-width: 0;
+    border-color: rgba(33, 33, 33, 0);
+    
+    background-color: rgba(68, 68, 68, 0);
+}
+
+.package-group-expander {
+    color: rgb(104, 104, 104);
+}
+
+.package-group-label {
+    color: rgb(255, 255, 255);
+}
+
+.package-group-separator {
+    background-color: rgb(48, 48, 48);
+}
+
+.package-group-info-box {
+    border-width: 1px;
+    border-color: rgb(33, 33, 33);
+}
+
+.package-group-info-box > Image {
+    --unity-image: resource("console.infoicon@2x");
+}
+
+/* Package Element */
+
+.package-foldout-box {
+    border-width: 0;
+    border-radius: 0;
+    background-color: rgb(56, 56, 56);
+}
+
+.package-foldout-box:hover {
+    background-color: rgb(68, 68, 68);
+}
+
+.package-foldout-box-draft:active {
+    background-color: rgb(48, 48, 48);
+}
+
+.package-foldout-box-expanded {
+    background-color: rgb(68, 68, 68);
+}
+
+.package-expander {
+    color: rgb(104, 104, 104);
+}
+
+.package-image {
+    border-radius: 5px;
+    background-image: resource("Sprite Icon");
+}
+
+.package-label {
+    color: rgb(255, 255, 255);
+}
+
+.package-info {
+    color: rgb(200, 200, 200);
+}
+
+.package-open-in-browser-button {
+    border-width: 0;
+    border-radius: 0;
+
+    background-color: rgba(0, 0, 0, 0);
+    background-image: url("../../Icons/open-in-browser.png");
+
+    -unity-background-image-tint-color: rgb(200, 200, 200);
+}
+
+.package-open-in-browser-button:hover {
+    -unity-background-image-tint-color: rgb(255, 255, 255);
+}
+
+.package-open-in-browser-button:active {
+    -unity-background-image-tint-color: rgb(155, 155, 155);
+}
+
+.package-header-progress-bar > .unity-progress-bar__container > .unity-progress-bar__background {
+    border-width: 0;
+    background-color: rgba(0, 0, 0, 0);
+}
+
+.package-header-progress-bar > .unity-progress-bar__container > .unity-progress-bar__background > .unity-progress-bar__progress {
+    background-image: none;
+    background-color: rgb(33, 150, 243);
+}
+
+/* Package Content Element */
+
+.package-content-element {
+    background-color: rgb(68, 68, 68);
+}
+
+.package-content-option-label-help-row > Image {
+    --unity-image: resource("d__Help@2x");
+}
+
+.package-content-option-dropdown {
+    color: rgb(238, 238, 238);
+    
+    border-width: 1px;
+    border-radius: 3px;
+    border-color: rgb(36, 36, 36);
+
+    background-color: rgb(88, 88, 88);
+}
+
+.package-content-option-dropdown:hover {
+    background-color: rgb(103, 103, 103);
+}
+
+/* MultiToggleSelection Element */
+
+.multi-toggle-box-scrollview {
+    border-width: 1px;
+    border-color: rgb(33, 33, 33);
+    background-color: rgb(58, 58, 58);
+}
+
+.multi-toggle-box-scrollview > * > .unity-scroll-view__vertical-scroller {
+    border-right-width: 0;
+}
+
+.multi-toggle-box-empty-label {
+    color: rgb(200, 200, 200);
+}
+
+.multi-toggle-box-toolbar {
+    border-width: 1px;
+    border-color: rgb(33, 33, 33);
+    background-color: rgb(58, 58, 58);
+}
+
+.multi-toggle-box-toolbar-filtering-box > ToolbarMenu {
+    color: rgb(188, 188, 188);
+
+    border-width: 1px;
+    border-radius: 3px;
+    border-color: rgb(36, 36, 36);
+
+    background-color: rgb(88, 88, 88);
+}
+
+/* Validation Element */
+
+.validation-result-box {
+    border-width: 1px;
+    border-color: rgb(33, 33, 33);
+}
+
+.validation-result-box > Image {
+    --unity-image: resource("console.infoicon@2x");
+}
+
+.validation-result-view-report-button {
+    color: rgb(68, 113, 229);
+    border-color: rgba(0, 0, 0, 0);
+    background-color: rgba(0, 0, 0, 0);
+}
+
+.validation-result-view-report-button:hover {
+    color: rgb(68, 133, 229);
+}
+
+.validation-result-view-report-button:active {
+    color: rgb(68, 93, 229);
+}
+
+/* Uploading Element */
+
+.uploading-export-button {
+    color: rgb(220, 220, 220);
+    border-width: 1px;
+    border-color: rgb(33, 33, 33);
+}
+
+.uploading-upload-button {
+    color: rgb(220, 220, 220);
+    border-width: 1px;
+    border-color: rgb(33, 33, 33);
+}
+
+.uploading-progress-bar > .unity-progress-bar__container > .unity-progress-bar__background {
+    border-width: 0;
+    border-radius: 2px;
+}
+
+.uploading-progress-bar > .unity-progress-bar__container > .unity-progress-bar__background > .unity-progress-bar__progress {
+    background-image: none;
+    background-color: rgb(33, 150, 243);
+}
+
+.uploading-cancel-button {
+    color: rgb(220, 220, 220);
+    border-width: 1px;
+    border-color: rgb(33, 33, 33);
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/PackageListView/ThemeDark.uss.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/PackageListView/ThemeDark.uss.meta
new file mode 100644
index 0000000..59f35b0
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/PackageListView/ThemeDark.uss.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 2096f0ee5b05ec643b409ded0d725eb3
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/PackageListView/ThemeDark.uss
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/PackageListView/ThemeLight.uss b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/PackageListView/ThemeLight.uss
new file mode 100644
index 0000000..f659dba
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/PackageListView/ThemeLight.uss
@@ -0,0 +1,238 @@
+/* Package List Toolbar */
+
+.package-list-toolbar {
+    border-bottom-width: 1px;
+    border-color: rgb(127, 127, 127);
+    
+    background-color: rgb(203, 203, 203);
+}
+
+.package-sort-menu {
+    color: rgb(9, 9, 9);
+    
+    border-width: 1px;
+    border-radius: 3px;
+    border-color: rgb(178, 178, 178);
+    
+    background-color: rgb(228, 228, 228);
+}
+
+.package-sort-menu:hover {
+    background-color: rgb(236, 236, 236);
+}
+
+.package-sort-menu:active {
+    background-color: rgb(220, 220, 220);
+}
+
+/* Loading Spinner  */
+
+.loading-spinner-image {
+    --unity-image: resource("WaitSpin00");
+}
+
+/* Package Group */
+
+.package-group-expander-box {
+    border-width: 0;
+    border-color: rgba(0, 0, 0, 0);
+    
+    background-color: rgba(0, 0, 0, 0);
+}
+
+.package-group-expander {
+    color: rgb(77, 77, 77);
+}
+
+.package-group-label {
+    color: rgb(0, 0, 0);
+}
+
+.package-group-separator
+{
+    background-color: rgb(48, 48, 48);
+}
+
+.package-group-info-box
+{
+    border-width: 1px;
+    border-color: rgb(33, 33, 33);
+}
+
+.package-group-info-box > Image
+{
+    --unity-image: resource("console.infoicon@2x");
+}
+
+/* Package Element */
+
+.package-foldout-box {
+    border-width: 0;
+    border-radius: 0;
+    background-color: rgb(198, 198, 198);
+}
+
+.package-foldout-box:hover {
+    background-color: rgb(212, 212, 212);
+}
+
+.package-foldout-box-draft:active {
+    background-color: rgb(180, 180, 180);
+}
+
+.package-foldout-box-expanded {
+    background-color: rgb(212, 212, 212);
+}
+
+.package-expander {
+    color: rgb(77, 77, 77);
+}
+
+.package-image {
+    border-radius: 5px;
+    background-image: resource("Sprite Icon");
+}
+
+.package-label {
+    color: rgb(0, 0, 0);
+}
+
+.package-info {
+    color: rgb(48, 48, 48);
+}
+
+.package-open-in-browser-button {
+    border-width: 0;
+    border-radius: 0;
+
+    background-color: rgba(0, 0, 0, 0);
+    background-image: url("../../Icons/open-in-browser.png");
+
+    -unity-background-image-tint-color: rgb(150, 150, 150);
+}
+
+.package-open-in-browser-button:hover {
+    -unity-background-image-tint-color: rgb(100, 100, 100);
+}
+
+.package-open-in-browser-button:active {
+    -unity-background-image-tint-color: rgb(50, 50, 50);
+}
+
+.package-header-progress-bar > .unity-progress-bar__container > .unity-progress-bar__background {
+    border-width: 0;
+    background-color: rgba(0, 0, 0, 0);
+}
+
+.package-header-progress-bar > .unity-progress-bar__container > .unity-progress-bar__background > .unity-progress-bar__progress {
+    background-image: none;
+    background-color: rgb(108, 157, 243);
+}
+
+/* Package Content Element */
+
+.package-content-element {
+    background-color: rgb(212, 212, 212);
+}
+
+.package-content-option-label-help-row  > Image {
+    --unity-image: resource("_Help@2x");
+}
+
+.package-content-option-dropdown {
+    color: rgb(9, 9, 9);
+
+    border-width: 1px;
+    border-radius: 3px;
+    border-color: rgb(178, 178, 178);
+
+    background-color: rgb(228, 228, 228);
+}
+
+.package-content-option-dropdown:hover {
+    background-color: rgb(236, 236, 236);
+}
+
+/* MultiToggleSelection Element */
+
+.multi-toggle-box-scrollview {
+    border-width: 1px;
+    border-color: rgb(33, 33, 33);
+    background-color: rgb(200, 200, 200);
+}
+
+.multi-toggle-box-scrollview > * > .unity-scroll-view__vertical-scroller {
+    border-right-width: 0;
+}
+
+.multi-toggle-box-empty-label {
+    color: rgb(0, 0, 0);
+}
+
+.multi-toggle-box-toolbar {
+    border-width: 1px;
+    border-color: rgb(33, 33, 33);
+    background-color: rgb(200, 200, 200);
+}
+
+.multi-toggle-box-toolbar-filtering-box > ToolbarMenu {
+    color: rgb(9, 9, 9);
+
+    border-width: 1px;
+    border-radius: 3px;
+    border-color: rgb(178, 178, 178);
+
+    background-color: rgb(228, 228, 228);
+}
+
+/* Validation Element */
+
+.validation-result-box {
+    border-width: 1px;
+    border-color: rgb(33, 33, 33);
+}
+
+.validation-result-box > Image {
+    --unity-image: resource("console.infoicon@2x");
+}
+
+.validation-result-view-report-button {
+    color: rgb(68, 113, 229);
+    border-color: rgba(0, 0, 0, 0);
+    background-color: rgba(0, 0, 0, 0);
+}
+
+.validation-result-view-report-button:hover {
+    color: rgb(68, 133, 229);
+}
+
+.validation-result-view-report-button:active {
+    color: rgb(68, 93, 229);
+}
+
+/* Uploading Element */
+
+.uploading-export-button {
+    border-width: 1px;
+    border-color: rgb(33, 33, 33);
+}
+
+.uploading-upload-button {
+    border-width: 1px;
+    border-color: rgb(33, 33, 33);
+}
+
+.uploading-progress-bar > .unity-progress-bar__container > .unity-progress-bar__background {
+    border-width: 0;
+    border-radius: 2px;
+}
+
+.uploading-progress-bar > .unity-progress-bar__container > .unity-progress-bar__background > .unity-progress-bar__progress {
+    background-image: none;
+    background-color: rgb(108, 157, 243);
+}
+
+.uploading-cancel-button {
+    border-width: 1px;
+    border-color: rgb(33, 33, 33);
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/PackageListView/ThemeLight.uss.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/PackageListView/ThemeLight.uss.meta
new file mode 100644
index 0000000..3c75bb1
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/PackageListView/ThemeLight.uss.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 9b79808cdce73b949abc32c5fada1bda
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/PackageListView/ThemeLight.uss
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/Style.uss b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/Style.uss
new file mode 100644
index 0000000..9c84140
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/Style.uss
@@ -0,0 +1,74 @@
+.uploader-window-root {
+    flex-grow: 1;
+}
+
+.uploader-window-root-scrollview {
+    flex-grow: 1;
+}
+
+.uploader-window-root-scrollview > * > .unity-scroll-view__content-container {
+    flex-grow: 1;
+}
+
+.uploader-window-root-scrollview > * > .unity-scroll-view__content-viewport {
+    flex-shrink: 1;
+}
+
+.uploader-window-root-scrollview > * > * > .unity-scroll-view__content-container {
+    flex-grow: 1;
+    flex-shrink: 1;
+}
+
+.account-toolbar {
+    flex-direction: row;
+    flex-shrink: 0;
+
+    justify-content: space-between;
+    margin: 0;
+}
+
+.account-toolbar-left-side-container {
+    flex-grow: 1;
+    flex-shrink: 0;
+    flex-basis: 0px;
+    overflow: hidden;
+    min-width: 16px;
+    align-self: center;
+    flex-direction: row;
+    margin: 3px 0px 3px 1px;
+}
+
+.account-toolbar-right-side-container {
+    flex-shrink: 1;
+    flex-grow: 0;
+    flex-wrap: wrap;
+    align-self: center;
+    flex-direction: row;
+    margin: 0;
+}
+
+.account-toolbar-user-image {
+    width: 16px;
+    height: 16px;
+    flex-shrink: 0;
+    margin-right: 1px;
+}
+
+.account-toolbar-email-label {
+    flex-shrink: 1;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    -unity-font-style: bold;
+}
+
+.account-toolbar-button-refresh {
+    flex-grow: 1;
+    min-width: 50px;
+    margin-right: 1px;
+}
+
+.account-toolbar-button-logout {
+    flex-grow: 1;
+    min-width: 50px;
+    margin-right: 1px;
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/Style.uss.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/Style.uss.meta
new file mode 100644
index 0000000..5c66c3e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/Style.uss.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 6f0343bfa66bbb344bee68a23d24cca8
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/Style.uss
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/ThemeDark.uss b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/ThemeDark.uss
new file mode 100644
index 0000000..4301920
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/ThemeDark.uss
@@ -0,0 +1,9 @@
+.account-toolbar {
+	background-color: rgb(68, 68, 68);
+	border-color: rgb(33, 33, 33);
+	border-top-width: 1px;
+}
+
+.account-toolbar-user-image {
+	background-image: url("../Icons/account-dark.png");
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/ThemeDark.uss.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/ThemeDark.uss.meta
new file mode 100644
index 0000000..ee3b491
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/ThemeDark.uss.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 26d328c2ffac2ff44af266e9c632f2ab
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/ThemeDark.uss
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/ThemeLight.uss b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/ThemeLight.uss
new file mode 100644
index 0000000..2de460c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/ThemeLight.uss
@@ -0,0 +1,9 @@
+.account-toolbar {
+	background-color: rgb(203, 203, 203);
+	border-color: rgb(127, 127, 127);
+	border-top-width: 1px;
+}
+
+.account-toolbar-user-image {
+	background-image: url("../Icons/account-light.png");
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/ThemeLight.uss.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/ThemeLight.uss.meta
new file mode 100644
index 0000000..8ddebb5
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/ThemeLight.uss.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: a994594cc493b7346b4d4a71d39908dc
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/Styles/ThemeLight.uss
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/UploaderWindow.cs b/Packages/com.unity.asset-store-tools/Editor/Uploader/UploaderWindow.cs
new file mode 100644
index 0000000..e92c50c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/UploaderWindow.cs
@@ -0,0 +1,232 @@
+using AssetStoreTools.Api.Models;
+using AssetStoreTools.Uploader.Services;
+using AssetStoreTools.Uploader.Services.Analytics;
+using AssetStoreTools.Uploader.Services.Api;
+using AssetStoreTools.Uploader.UI.Elements;
+using AssetStoreTools.Uploader.UI.Views;
+using AssetStoreTools.Utility;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using UnityEditor;
+using UnityEditor.UIElements;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Uploader
+{
+    internal class UploaderWindow : AssetStoreToolsWindow
+    {
+        private const string DebugPhrase = "debug";
+
+        // Services
+        private ICachingService _cachingService;
+        private IAuthenticationService _authenticationService;
+        private IPackageDownloadingService _packageDownloadingService;
+        private IPackageUploadingService _packageUploadingService;
+        private IAnalyticsService _analyticsService;
+        private IPackageFactoryService _packageFactoryService;
+
+        // Data
+        private bool _isQuitting = false;
+
+        // UI
+        private VisualElement _uploaderWindowRoot;
+        private ScrollView _rootScrollView;
+
+        private LoginView _loginView;
+        private PackageListView _packageListView;
+        private AccountToolbar _accountToolbar;
+
+        protected override string WindowTitle => "Asset Store Uploader";
+
+        protected override void Init()
+        {
+            RegisterServices();
+            SetupWindow();
+        }
+
+        private void RegisterServices()
+        {
+            var uploaderServiceProvider = UploaderServiceProvider.Instance;
+            _analyticsService = uploaderServiceProvider.GetService<IAnalyticsService>();
+            _cachingService = uploaderServiceProvider.GetService<ICachingService>();
+            _authenticationService = uploaderServiceProvider.GetService<IAuthenticationService>();
+            _packageDownloadingService = uploaderServiceProvider.GetService<IPackageDownloadingService>();
+            _packageUploadingService = uploaderServiceProvider.GetService<IPackageUploadingService>();
+            _packageFactoryService = uploaderServiceProvider.GetService<IPackageFactoryService>();
+        }
+
+        private void SetupWindow()
+        {
+            minSize = new Vector2(400, 430);
+            this.SetAntiAliasing(4);
+            rootVisualElement.styleSheets.Add(StyleSelector.UploaderWindow.UploaderWindowStyle);
+            rootVisualElement.styleSheets.Add(StyleSelector.UploaderWindow.UploaderWindowTheme);
+
+            if (_cachingService.GetCachedUploaderWindow(out _uploaderWindowRoot))
+            {
+                rootVisualElement.Add(_uploaderWindowRoot);
+                return;
+            }
+
+            _uploaderWindowRoot = new VisualElement();
+            _uploaderWindowRoot.AddToClassList("uploader-window-root");
+            rootVisualElement.Add(_uploaderWindowRoot);
+
+            _rootScrollView = new ScrollView();
+            _rootScrollView.AddToClassList("uploader-window-root-scrollview");
+            _uploaderWindowRoot.Add(_rootScrollView);
+
+            CreateLoginView();
+            CreatePackageListView();
+            CreateAccountToolbar();
+            EditorApplication.wantsToQuit += OnWantsToQuit;
+
+            _cachingService.CacheUploaderWindow(_uploaderWindowRoot);
+
+            PerformAuthentication();
+        }
+
+        private void CreateLoginView()
+        {
+            _loginView = new LoginView(_authenticationService);
+            _loginView.OnAuthenticated += OnAuthenticationSuccess;
+            _rootScrollView.Add(_loginView);
+        }
+
+        private void CreatePackageListView()
+        {
+            _packageListView = new PackageListView(_packageDownloadingService, _packageFactoryService);
+            _packageListView.OnInitializeError += PackageViewInitializationError;
+            _rootScrollView.Add(_packageListView);
+        }
+
+        private void CreateAccountToolbar()
+        {
+            _accountToolbar = new AccountToolbar();
+            _accountToolbar.OnRefresh += RefreshPackages;
+            _accountToolbar.OnLogout += LogOut;
+            _uploaderWindowRoot.Add(_accountToolbar);
+        }
+
+        private void PerformAuthentication()
+        {
+            ShowAuthenticationView();
+            _loginView.LoginWithSessionToken();
+        }
+
+        private async void OnAuthenticationSuccess(User user)
+        {
+            _accountToolbar.SetUser(user);
+            _accountToolbar.DisableButtons();
+
+            ShowAccountPackageView();
+            await _packageListView.LoadPackages(true);
+
+            _accountToolbar.EnableButtons();
+        }
+
+        private async Task RefreshPackages()
+        {
+            _packageUploadingService.StopAllUploadinng();
+            _packageDownloadingService.StopDownloading();
+
+            await _packageListView.LoadPackages(false);
+        }
+
+        private void LogOut()
+        {
+            _packageUploadingService.StopAllUploadinng();
+            _packageDownloadingService.StopDownloading();
+
+            _authenticationService.Deauthenticate();
+            _packageDownloadingService.ClearPackageData();
+
+            _accountToolbar.SetUser(null);
+            ShowAuthenticationView();
+        }
+
+        private void PackageViewInitializationError(Exception e)
+        {
+            _loginView.DisplayError(e.Message);
+            LogOut();
+        }
+
+        private void ShowAuthenticationView()
+        {
+            HideElement(_accountToolbar);
+            HideElement(_packageListView);
+            ShowElement(_loginView);
+        }
+
+        private void ShowAccountPackageView()
+        {
+            HideElement(_loginView);
+            ShowElement(_accountToolbar);
+            ShowElement(_packageListView);
+        }
+
+        private void ShowElement(params VisualElement[] elements)
+        {
+            foreach (var e in elements)
+                e.style.display = DisplayStyle.Flex;
+        }
+
+        private void HideElement(params VisualElement[] elements)
+        {
+            foreach (var e in elements)
+                e.style.display = DisplayStyle.None;
+        }
+
+        private void OnDestroy()
+        {
+            if (!_isQuitting && _packageUploadingService.IsUploading)
+            {
+                EditorUtility.DisplayDialog("Notice", "Assets are still being uploaded to the Asset Store. " +
+                    "If you wish to check on the progress, please re-open the Asset Store Uploader window", "OK");
+            }
+        }
+
+        private bool OnWantsToQuit()
+        {
+            if (!_packageUploadingService.IsUploading)
+                return true;
+
+            _isQuitting = EditorUtility.DisplayDialog("Notice", "Assets are still being uploaded to the Asset Store. " +
+                    "Would you still like to close Unity Editor?", "Yes", "No");
+
+            return _isQuitting;
+        }
+
+        #region Debug Utility
+
+        private readonly List<char> _debugBuffer = new List<char>();
+
+        private void OnGUI()
+        {
+            CheckForDebugMode();
+        }
+
+        private void CheckForDebugMode()
+        {
+            Event e = Event.current;
+
+            if (e.type != EventType.KeyDown || e.keyCode == KeyCode.None)
+                return;
+
+            _debugBuffer.Add(e.keyCode.ToString().ToLower()[0]);
+            if (_debugBuffer.Count > DebugPhrase.Length)
+                _debugBuffer.RemoveAt(0);
+
+            if (string.Join(string.Empty, _debugBuffer.ToArray()) != DebugPhrase)
+                return;
+
+            ASDebug.DebugModeEnabled = !ASDebug.DebugModeEnabled;
+            ASDebug.Log($"DEBUG MODE ENABLED: {ASDebug.DebugModeEnabled}");
+            _debugBuffer.Clear();
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Uploader/UploaderWindow.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Uploader/UploaderWindow.cs.meta
new file mode 100644
index 0000000..2a90137
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Uploader/UploaderWindow.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 7b5319699cc84194a9a768ad33b86c21
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Uploader/UploaderWindow.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Utility.meta b/Packages/com.unity.asset-store-tools/Editor/Utility.meta
new file mode 100644
index 0000000..9a2bdff
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Utility.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3dfd03e520c145b45a32c7e2915fe3cb
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Utility/ASDebug.cs b/Packages/com.unity.asset-store-tools/Editor/Utility/ASDebug.cs
new file mode 100644
index 0000000..69643cb
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Utility/ASDebug.cs
@@ -0,0 +1,65 @@
+using UnityEditor;
+using UnityEngine;
+
+namespace AssetStoreTools.Utility
+{
+    internal static class ASDebug
+    {
+        private enum LogType
+        {
+            Info,
+            Warning,
+            Error
+        }
+
+        private static string FormatInfo(object message) => $"<b>[AST Info]</b> {message}";
+        private static string FormatWarning(object message) => $"<color=yellow><b>[AST Warning]</b></color> {message}";
+        private static string FormatError(object message) => $"<color=red><b>[AST Error]</b></color> {message}";
+
+
+        private static bool s_debugModeEnabled = EditorPrefs.GetBool(Constants.Debug.DebugModeKey);
+
+        public static bool DebugModeEnabled
+        {
+            get => s_debugModeEnabled;
+            set { s_debugModeEnabled = value; EditorPrefs.SetBool(Constants.Debug.DebugModeKey, value); }
+        }
+
+        public static void Log(object message)
+        {
+            LogMessage(message, LogType.Info);
+        }
+
+        public static void LogWarning(object message)
+        {
+            LogMessage(message, LogType.Warning);
+        }
+
+        public static void LogError(object message)
+        {
+            LogMessage(message, LogType.Error);
+        }
+
+        private static void LogMessage(object message, LogType type)
+        {
+            if (!DebugModeEnabled)
+                return;
+
+            switch (type)
+            {
+                case LogType.Info:
+                    Debug.Log(FormatInfo(message));
+                    break;
+                case LogType.Warning:
+                    Debug.LogWarning(FormatWarning(message));
+                    break;
+                case LogType.Error:
+                    Debug.LogError(FormatError(message));
+                    break;
+                default:
+                    Debug.Log(message);
+                    break;
+            }
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Utility/ASDebug.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Utility/ASDebug.cs.meta
new file mode 100644
index 0000000..2af38a3
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Utility/ASDebug.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 478caa497d99100429a0509fa487bfe4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Utility/ASDebug.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Utility/ASToolsPreferences.cs b/Packages/com.unity.asset-store-tools/Editor/Utility/ASToolsPreferences.cs
new file mode 100644
index 0000000..7acbb55
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Utility/ASToolsPreferences.cs
@@ -0,0 +1,134 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using UnityEditor;
+using UnityEngine;
+
+namespace AssetStoreTools.Utility
+{
+    internal class ASToolsPreferences
+    {
+        private static ASToolsPreferences s_instance;
+        public static ASToolsPreferences Instance => s_instance ?? (s_instance = new ASToolsPreferences());
+
+        public static event Action OnSettingsChange;
+
+        private ASToolsPreferences()
+        {
+            Load();
+        }
+
+        private void Load()
+        {
+            CheckForUpdates = PlayerPrefs.GetInt("AST_CheckForUpdates", 1) == 1;
+            LegacyVersionCheck = PlayerPrefs.GetInt("AST_LegacyVersionCheck", 1) == 1;
+            UploadVersionCheck = PlayerPrefs.GetInt("AST_UploadVersionCheck", 1) == 1;
+            DisplayHiddenMetaDialog = PlayerPrefs.GetInt("AST_HiddenFolderMetaCheck", 1) == 1;
+            EnableSymlinkSupport = PlayerPrefs.GetInt("AST_EnableSymlinkSupport", 0) == 1;
+            UseLegacyExporting = PlayerPrefs.GetInt("AST_UseLegacyExporting", 0) == 1;
+        }
+
+        public void Save(bool triggerSettingsChange = false)
+        {
+            PlayerPrefs.SetInt("AST_CheckForUpdates", CheckForUpdates ? 1 : 0);
+            PlayerPrefs.SetInt("AST_LegacyVersionCheck", LegacyVersionCheck ? 1 : 0);
+            PlayerPrefs.SetInt("AST_UploadVersionCheck", UploadVersionCheck ? 1 : 0);
+            PlayerPrefs.SetInt("AST_HiddenFolderMetaCheck", DisplayHiddenMetaDialog ? 1 : 0);
+            PlayerPrefs.SetInt("AST_EnableSymlinkSupport", EnableSymlinkSupport ? 1 : 0);
+            PlayerPrefs.SetInt("AST_UseLegacyExporting", UseLegacyExporting ? 1 : 0);
+            PlayerPrefs.Save();
+
+            if (triggerSettingsChange)
+                OnSettingsChange?.Invoke();
+        }
+
+        /// <summary>
+        /// Periodically check if an update for the Asset Store Publishing Tools is available
+        /// </summary>
+        public bool CheckForUpdates;
+
+        /// <summary>
+        /// Check if legacy Asset Store Tools are in the Project
+        /// </summary>
+        public bool LegacyVersionCheck;
+
+        /// <summary>
+        /// Enables a DisplayDialog when hidden folders are found to be missing meta files
+        /// </summary>
+        public bool DisplayHiddenMetaDialog;
+
+        /// <summary>
+        /// Check if the package has been uploaded from a correct Unity version at least once
+        /// </summary>
+        public bool UploadVersionCheck;
+
+        /// <summary>
+        /// Enables Junction symlink support
+        /// </summary>
+        public bool EnableSymlinkSupport;
+
+        /// <summary>
+        /// Enables legacy exporting for Folder Upload workflow
+        /// </summary>
+        public bool UseLegacyExporting;
+    }
+
+    internal class ASToolsPreferencesProvider : SettingsProvider
+    {
+        private const string SettingsPath = "Project/Asset Store Tools";
+
+        private class Styles
+        {
+            public static readonly GUIContent CheckForUpdatesLabel = EditorGUIUtility.TrTextContent("Check for Updates", "Periodically check if an update for the Asset Store Publishing Tools is available.");
+            public static readonly GUIContent LegacyVersionCheckLabel = EditorGUIUtility.TrTextContent("Legacy ASTools Check", "Enable Legacy Asset Store Tools version checking.");
+            public static readonly GUIContent UploadVersionCheckLabel = EditorGUIUtility.TrTextContent("Upload Version Check", "Check if the package has been uploader from a correct Unity version at least once.");
+            public static readonly GUIContent DisplayHiddenMetaDialogLabel = EditorGUIUtility.TrTextContent("Display Hidden Folder Meta Dialog", "Show a DisplayDialog when hidden folders are found to be missing meta files.\nNote: this only affects hidden folders ending with a '~' character");
+            public static readonly GUIContent EnableSymlinkSupportLabel = EditorGUIUtility.TrTextContent("Enable Symlink Support", "Enable Junction Symlink support. Note: folder selection validation will take longer.");
+            public static readonly GUIContent UseLegacyExportingLabel = EditorGUIUtility.TrTextContent("Use Legacy Exporting", "Enabling this option uses native Unity methods when exporting packages for the Folder Upload workflow.\nNote: individual package dependency selection when choosing to 'Include Package Manifest' is unavailable when this option is enabled.");
+            public static readonly GUIContent UseCustomPreviewsLabel = EditorGUIUtility.TrTextContent("Enable High Quality Previews (experimental)", "Override native asset preview retrieval with higher-quality preview generation");
+        }
+
+        public static void OpenSettings()
+        {
+            SettingsService.OpenProjectSettings(SettingsPath);
+        }
+
+        private ASToolsPreferencesProvider(string path, SettingsScope scopes, IEnumerable<string> keywords = null)
+            : base(path, scopes, keywords) { }
+
+        public override void OnGUI(string searchContext)
+        {
+            var preferences = ASToolsPreferences.Instance;
+
+            EditorGUI.BeginChangeCheck();
+            using (CreateSettingsWindowGUIScope())
+            {
+                preferences.CheckForUpdates = EditorGUILayout.Toggle(Styles.CheckForUpdatesLabel, preferences.CheckForUpdates);
+                preferences.LegacyVersionCheck = EditorGUILayout.Toggle(Styles.LegacyVersionCheckLabel, preferences.LegacyVersionCheck);
+                preferences.UploadVersionCheck = EditorGUILayout.Toggle(Styles.UploadVersionCheckLabel, preferences.UploadVersionCheck);
+                preferences.DisplayHiddenMetaDialog = EditorGUILayout.Toggle(Styles.DisplayHiddenMetaDialogLabel, preferences.DisplayHiddenMetaDialog);
+                preferences.EnableSymlinkSupport = EditorGUILayout.Toggle(Styles.EnableSymlinkSupportLabel, preferences.EnableSymlinkSupport);
+                preferences.UseLegacyExporting = EditorGUILayout.Toggle(Styles.UseLegacyExportingLabel, preferences.UseLegacyExporting);
+            }
+
+            if (EditorGUI.EndChangeCheck())
+            {
+                ASToolsPreferences.Instance.Save(true);
+            }
+        }
+
+        [SettingsProvider]
+        public static SettingsProvider CreateAssetStoreToolsSettingProvider()
+        {
+            var provider = new ASToolsPreferencesProvider(SettingsPath, SettingsScope.Project, GetSearchKeywordsFromGUIContentProperties<Styles>());
+            return provider;
+        }
+
+        private IDisposable CreateSettingsWindowGUIScope()
+        {
+            var unityEditorAssembly = Assembly.GetAssembly(typeof(EditorWindow));
+            var type = unityEditorAssembly.GetType("UnityEditor.SettingsWindow+GUIScope");
+            return Activator.CreateInstance(type) as IDisposable;
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Utility/ASToolsPreferences.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Utility/ASToolsPreferences.cs.meta
new file mode 100644
index 0000000..de83182
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Utility/ASToolsPreferences.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: b75179c8d22a35b42a543d6fa7857ce0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Utility/ASToolsPreferences.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Utility/ASToolsUpdater.cs b/Packages/com.unity.asset-store-tools/Editor/Utility/ASToolsUpdater.cs
new file mode 100644
index 0000000..a3b639c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Utility/ASToolsUpdater.cs
@@ -0,0 +1,250 @@
+using AssetStoreTools.Api;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Utility
+{
+    [InitializeOnLoad]
+    internal class ASToolsUpdater : AssetStoreToolsWindow
+    {
+        protected override string WindowTitle => "Asset Store Tools Update Check";
+
+        private static IAssetStoreApi _api;
+
+        private VisualElement _loadingContainer;
+        private VisualElement _versionInfoContainer;
+
+        private Image _loadingImage;
+        private double _lastTimeSinceStartup;
+        private double _timeSinceLoadingImageChange;
+        private int _loadingImageIndex;
+
+        private static bool _updateCheckPerformed
+        {
+            get
+            {
+                return SessionState.GetBool("AST_UpdateChecked", false);
+            }
+            set
+            {
+                SessionState.SetBool("AST_UpdateChecked", value);
+            }
+        }
+
+        static ASToolsUpdater()
+        {
+            _api = new AssetStoreApi(new AssetStoreClient());
+            // Retrieving cached SessionState/PlayerPrefs values is not allowed from an instance field initializer
+            EditorApplication.update += CheckForUpdatesAfterEditorUpdate;
+        }
+
+        private static async void CheckForUpdatesAfterEditorUpdate()
+        {
+            EditorApplication.update -= CheckForUpdatesAfterEditorUpdate;
+
+            if (!ShouldCheckForUpdates())
+                return;
+
+            await CheckForUpdates((success, currentVersion, latestVersion) =>
+            {
+                if (success && currentVersion < latestVersion)
+                {
+                    AssetStoreTools.OpenUpdateChecker();
+                }
+            });
+        }
+
+        private static bool ShouldCheckForUpdates()
+        {
+            if (!ASToolsPreferences.Instance.CheckForUpdates)
+                return false;
+
+            return _updateCheckPerformed == false;
+        }
+
+        private static async Task CheckForUpdates(Action<bool, Version, Version> OnUpdatesChecked)
+        {
+            _updateCheckPerformed = true;
+            var latestVersionResult = await _api.GetLatestAssetStoreToolsVersion();
+            if (!latestVersionResult.Success)
+            {
+                OnUpdatesChecked?.Invoke(false, null, null);
+                return;
+            }
+
+            Version currentVersion = null;
+            Version latestVersion = null;
+
+            try
+            {
+                var latestVersionStr = latestVersionResult.Version;
+                var currentVersionStr = PackageUtility.GetAllPackages().FirstOrDefault(x => x.name == "com.unity.asset-store-tools").version;
+
+                currentVersion = new Version(currentVersionStr);
+                latestVersion = new Version(latestVersionStr);
+            }
+            catch
+            {
+                OnUpdatesChecked?.Invoke(false, null, null);
+            }
+
+            OnUpdatesChecked?.Invoke(true, currentVersion, latestVersion);
+        }
+
+        protected override void Init()
+        {
+            rootVisualElement.styleSheets.Add(StyleSelector.UpdaterWindow.UpdaterWindowStyle);
+            rootVisualElement.styleSheets.Add(StyleSelector.UpdaterWindow.UpdaterWindowTheme);
+
+            SetupLoadingSpinner();
+            _ = CheckForUpdates(OnVersionsRetrieved);
+        }
+
+        private void OnVersionsRetrieved(bool success, Version currentVersion, Version latestVersion)
+        {
+            if (_loadingContainer != null)
+                _loadingContainer.style.display = DisplayStyle.None;
+
+            if (success)
+            {
+                SetupVersionInfo(currentVersion, latestVersion);
+            }
+            else
+            {
+                SetupFailInfo();
+            }
+        }
+
+        private void SetupLoadingSpinner()
+        {
+            _loadingContainer = new VisualElement();
+            _loadingContainer.AddToClassList("updater-loading-container");
+            _loadingImage = new Image();
+            EditorApplication.update += LoadingSpinLoop;
+
+            _loadingContainer.Add(_loadingImage);
+            rootVisualElement.Add(_loadingContainer);
+        }
+
+        private void SetupVersionInfo(Version currentVersion, Version latestVersion)
+        {
+            _versionInfoContainer = new VisualElement();
+            _versionInfoContainer.AddToClassList("updater-info-container");
+
+            AddDescriptionLabels(currentVersion, latestVersion);
+            AddUpdateButtons(currentVersion, latestVersion);
+            AddCheckForUpdatesToggle();
+
+            rootVisualElement.Add(_versionInfoContainer);
+        }
+
+        private void AddDescriptionLabels(Version currentVersion, Version latestVersion)
+        {
+            var descriptionText = currentVersion < latestVersion ?
+                "An update to the Asset Store Publishing Tools is available. Updating to the latest version is highly recommended." :
+                "Asset Store Publishing Tools are up to date!";
+
+            var labelContainer = new VisualElement();
+            labelContainer.AddToClassList("updater-info-container-labels");
+            var descriptionLabel = new Label(descriptionText);
+            descriptionLabel.AddToClassList("updater-info-container-labels-description");
+
+            var currentVersionRow = new VisualElement();
+            currentVersionRow.AddToClassList("updater-info-container-labels-row");
+            var latestVersionRow = new VisualElement();
+            latestVersionRow.AddToClassList("updater-info-container-labels-row");
+
+            var currentVersionLabel = new Label("Current version:");
+            currentVersionLabel.AddToClassList("updater-info-container-labels-row-identifier");
+            var latestVersionLabel = new Label("Latest version:");
+            latestVersionLabel.AddToClassList("updater-info-container-labels-row-identifier");
+
+            var currentVersionLabelValue = new Label(currentVersion.ToString());
+            var latestVersionLabelValue = new Label(latestVersion.ToString());
+
+            currentVersionRow.Add(currentVersionLabel);
+            currentVersionRow.Add(currentVersionLabelValue);
+            latestVersionRow.Add(latestVersionLabel);
+            latestVersionRow.Add(latestVersionLabelValue);
+
+            labelContainer.Add(descriptionLabel);
+            labelContainer.Add(currentVersionRow);
+            labelContainer.Add(latestVersionRow);
+
+            _versionInfoContainer.Add(labelContainer);
+        }
+
+        private void AddUpdateButtons(Version currentVersion, Version latestVersion)
+        {
+            if (currentVersion >= latestVersion)
+                return;
+
+            var buttonContainer = new VisualElement();
+            buttonContainer.AddToClassList("updater-info-container-buttons");
+            var latestVersionButton = new Button(() => Application.OpenURL(Constants.Updater.AssetStoreToolsUrl)) { text = "Get the latest version" };
+            var skipVersionButton = new Button(Close) { text = "Skip for now" };
+
+            buttonContainer.Add(latestVersionButton);
+            buttonContainer.Add(skipVersionButton);
+
+            _versionInfoContainer.Add(buttonContainer);
+        }
+
+        private void AddCheckForUpdatesToggle()
+        {
+            var toggleContainer = new VisualElement();
+            toggleContainer.AddToClassList("updater-info-container-toggle");
+            var checkForUpdatesToggle = new Toggle() { text = "Check for Updates", value = ASToolsPreferences.Instance.CheckForUpdates };
+            checkForUpdatesToggle.RegisterValueChangedCallback(OnCheckForUpdatesToggleChanged);
+
+            toggleContainer.Add(checkForUpdatesToggle);
+            _versionInfoContainer.Add(toggleContainer);
+        }
+
+        private void OnCheckForUpdatesToggleChanged(ChangeEvent<bool> evt)
+        {
+            ASToolsPreferences.Instance.CheckForUpdates = evt.newValue;
+            ASToolsPreferences.Instance.Save();
+        }
+
+        private void SetupFailInfo()
+        {
+            var failContainer = new VisualElement();
+            failContainer.AddToClassList("updater-fail-container");
+
+            var failImage = new Image();
+            var failDescription = new Label("Asset Store Publishing Tools could not retrieve information about the latest version.");
+
+            failContainer.Add(failImage);
+            failContainer.Add(failDescription);
+
+            rootVisualElement.Add(failContainer);
+        }
+
+        private void LoadingSpinLoop()
+        {
+            var currentTimeSinceStartup = EditorApplication.timeSinceStartup;
+            var deltaTime = EditorApplication.timeSinceStartup - _lastTimeSinceStartup;
+            _lastTimeSinceStartup = currentTimeSinceStartup;
+
+            _timeSinceLoadingImageChange += deltaTime;
+            if (_timeSinceLoadingImageChange < 0.075)
+                return;
+
+            _timeSinceLoadingImageChange = 0;
+
+            _loadingImage.image = EditorGUIUtility.IconContent($"WaitSpin{_loadingImageIndex++:00}").image;
+            if (_loadingImageIndex > 11)
+                _loadingImageIndex = 0;
+        }
+
+        private void OnDestroy()
+        {
+            EditorApplication.update -= LoadingSpinLoop;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Utility/ASToolsUpdater.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Utility/ASToolsUpdater.cs.meta
new file mode 100644
index 0000000..38afc15
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Utility/ASToolsUpdater.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 2ac370b9d2279ed4c9faec7134ba2759
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Utility/ASToolsUpdater.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Utility/CacheUtil.cs b/Packages/com.unity.asset-store-tools/Editor/Utility/CacheUtil.cs
new file mode 100644
index 0000000..a0bea03
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Utility/CacheUtil.cs
@@ -0,0 +1,266 @@
+using System.IO;
+using CacheConstants = AssetStoreTools.Constants.Cache;
+
+namespace AssetStoreTools.Utility
+{
+    internal static class CacheUtil
+    {
+        public static bool GetFileFromTempCache(string fileName, out string filePath)
+        {
+            return GetCacheFile(CacheConstants.TempCachePath, fileName, out filePath);
+        }
+
+        public static bool GetFileFromPersistentCache(string fileName, out string filePath)
+        {
+            return GetCacheFile(CacheConstants.PersistentCachePath, fileName, out filePath);
+        }
+
+        public static bool GetFileFromProjectPersistentCache(string projectPath, string fileName, out string filePath)
+        {
+            return GetCacheFile(Path.Combine(projectPath, CacheConstants.PersistentCachePath), fileName, out filePath);
+        }
+
+        private static bool GetCacheFile(string rootPath, string fileName, out string filePath)
+        {
+            filePath = Path.Combine(rootPath, fileName);
+            return File.Exists(filePath);
+        }
+
+        public static void CreateFileInTempCache(string fileName, object content, bool overwrite)
+        {
+            CreateCacheFile(CacheConstants.TempCachePath, fileName, content, overwrite);
+        }
+
+        public static void CreateFileInPersistentCache(string fileName, object content, bool overwrite)
+        {
+            CreateCacheFile(CacheConstants.PersistentCachePath, fileName, content, overwrite);
+        }
+
+        private static void CreateCacheFile(string rootPath, string fileName, object content, bool overwrite)
+        {
+            if (!Directory.Exists(rootPath))
+                Directory.CreateDirectory(rootPath);
+
+            var fullPath = Path.Combine(rootPath, fileName);
+
+            bool willUpdate = false;
+            if (File.Exists(fullPath))
+            {
+                if (overwrite)
+                {
+                    File.Delete(fullPath);
+                    willUpdate = true;
+                }
+                else
+                    return;
+            }
+
+            switch (content)
+            {
+                case byte[] bytes:
+                    File.WriteAllBytes(fullPath, bytes);
+                    break;
+                default:
+                    File.WriteAllText(fullPath, content.ToString());
+                    break;
+            }
+
+            var keyword = willUpdate ? "Updating" : "Creating";
+            ASDebug.Log($"{keyword} cache file: '{fullPath}'");
+        }
+
+        public static void DeleteFileFromTempCache(string fileName)
+        {
+            DeleteFileFromCache(CacheConstants.TempCachePath, fileName);
+        }
+
+        public static void DeleteFileFromPersistentCache(string fileName)
+        {
+            DeleteFileFromCache(CacheConstants.PersistentCachePath, fileName);
+        }
+
+        private static void DeleteFileFromCache(string rootPath, string fileName)
+        {
+            var path = Path.Combine(rootPath, fileName);
+            if (File.Exists(path))
+                File.Delete(path);
+        }
+
+        //private static void CreateFileInPersistentCache(string fileName, object content, bool overwrite)
+        //{
+        //    CreateCacheFile(CacheConstants.PersistentCachePath, fileName, content, overwrite);
+        //}
+
+        //private static void CreateCacheFile(string rootPath, string fileName, object content, bool overwrite)
+        //{
+        //    if (!Directory.Exists(rootPath))
+        //        Directory.CreateDirectory(rootPath);
+
+        //    var fullPath = Path.Combine(rootPath, fileName);
+
+        //    if (File.Exists(fullPath))
+        //    {
+        //        if (overwrite)
+        //            File.Delete(fullPath);
+        //        else
+        //            return;
+        //    }
+
+        //    switch (content)
+        //    {
+        //        case byte[] bytes:
+        //            File.WriteAllBytes(fullPath, bytes);
+        //            break;
+        //        default:
+        //            File.WriteAllText(fullPath, content.ToString());
+        //            break;
+        //    }
+        //    ASDebug.Log($"Creating cached file: '{fullPath}'");
+        //}
+
+        //public static void ClearTempCache()
+        //{
+        //    if (!File.Exists(Path.Combine(CacheConstants.TempCachePath, CacheConstants.PackageDataFile)))
+        //        return;
+
+
+        //    // Cache consists of package data and package texture thumbnails. We don't clear
+        //    // texture thumbnails here since they are less likely to change. They are still
+        //    // deleted and redownloaded every project restart (because of being stored in the 'Temp' folder)
+        //    var fullPath = Path.Combine(CacheConstants.TempCachePath, CacheConstants.PackageDataFile);
+        //    ASDebug.Log($"Deleting cached file '{fullPath}'");
+        //    File.Delete(fullPath);
+        //}
+
+        //public static void CachePackageMetadata(List<Package> data)
+        //{
+        //    var serializerSettings = new JsonSerializerSettings()
+        //    {
+        //        ContractResolver = Package.CachedPackageResolver.Instance,
+        //        Formatting = Formatting.Indented
+        //    };
+
+        //    CreateFileInTempCache(CacheConstants.PackageDataFile, JsonConvert.SerializeObject(data, serializerSettings), true);
+        //}
+
+        //public static void UpdatePackageMetadata(Package data)
+        //{
+        //    if (!GetCachedPackageMetadata(out var cachedData))
+        //        return;
+
+        //    var index = cachedData.FindIndex(x => x.PackageId.Equals(data.PackageId));
+        //    if (index == -1)
+        //    {
+        //        cachedData.Add(data);
+        //    }
+        //    else
+        //    {
+        //        cachedData.RemoveAt(index);
+        //        cachedData.Insert(index, data);
+        //    }
+
+        //    CachePackageMetadata(cachedData);
+        //}
+
+        //public static bool GetCachedPackageMetadata(out List<Package> data)
+        //{
+        //    data = new List<Package>();
+        //    var path = Path.Combine(CacheConstants.TempCachePath, CacheConstants.PackageDataFile);
+        //    if (!File.Exists(path))
+        //        return false;
+
+        //    try
+        //    {
+        //        var serializerSettings = new JsonSerializerSettings()
+        //        {
+        //            ContractResolver = Package.CachedPackageResolver.Instance
+        //        };
+
+        //        data = JsonConvert.DeserializeObject<List<Package>>(File.ReadAllText(path, Encoding.UTF8), serializerSettings);
+        //        return true;
+        //    }
+        //    catch
+        //    {
+        //        return false;
+        //    }
+        //}
+
+        //public static void CacheTexture(string packageId, Texture2D texture)
+        //{
+        //    CreateFileInTempCache($"{packageId}.png", texture.EncodeToPNG(), true);
+        //}
+
+        //public static bool GetCachedTexture(string packageId, out Texture2D texture)
+        //{
+        //    texture = new Texture2D(1, 1);
+        //    var path = Path.Combine(CacheConstants.TempCachePath, $"{packageId}.png");
+        //    if (!File.Exists(path))
+        //        return false;
+
+        //    texture.LoadImage(File.ReadAllBytes(path));
+        //    return true;
+        //}
+
+        //public static void CacheWorkflowStateData(string packageId, WorkflowStateData data)
+        //{
+        //    var fileName = $"{packageId}-workflowStateData.asset";
+        //    CreateFileInPersistentCache(fileName, JsonConvert.SerializeObject(data, Formatting.Indented), true);
+        //}
+
+        //public static bool GetCachedWorkflowStateData(string packageId, out WorkflowStateData data)
+        //{
+        //    data = null;
+        //    var path = Path.Combine(CacheConstants.PersistentCachePath, $"{packageId}-workflowStateData.asset");
+        //    if (!File.Exists(path))
+        //        return false;
+
+        //    data = JsonConvert.DeserializeObject<WorkflowStateData>(File.ReadAllText(path, Encoding.UTF8));
+        //    return true;
+        //}
+
+        //public static void CacheValidationStateData(ValidationStateData data)
+        //{
+        //    var serializerSettings = new JsonSerializerSettings()
+        //    {
+        //        ContractResolver = ValidationStateDataContractResolver.Instance,
+        //        Formatting = Formatting.Indented,
+        //        TypeNameHandling = TypeNameHandling.Auto,
+        //        Converters = new List<JsonConverter>() { new StringEnumConverter() }
+        //    };
+
+        //    CreateFileInPersistentCache(CacheConstants.ValidationResultFile, JsonConvert.SerializeObject(data, serializerSettings), true);
+        //}
+
+        //public static bool GetCachedValidationStateData(out ValidationStateData data)
+        //{
+        //    return GetCachedValidationStateData(Constants.RootProjectPath, out data);
+        //}
+
+        //public static bool GetCachedValidationStateData(string projectPath, out ValidationStateData data)
+        //{
+        //    data = null;
+        //    var path = Path.Combine(projectPath, CacheConstants.PersistentCachePath, CacheConstants.ValidationResultFile);
+        //    if (!File.Exists(path))
+        //        return false;
+
+        //    try
+        //    {
+        //        var serializerSettings = new JsonSerializerSettings()
+        //        {
+        //            ContractResolver = ValidationStateDataContractResolver.Instance,
+        //            Formatting = Formatting.Indented,
+        //            TypeNameHandling = TypeNameHandling.Auto,
+        //            Converters = new List<JsonConverter>() { new StringEnumConverter() }
+        //        };
+
+        //        data = JsonConvert.DeserializeObject<ValidationStateData>(File.ReadAllText(path, Encoding.UTF8), serializerSettings);
+        //        return true;
+        //    }
+        //    catch (System.Exception e)
+        //    {
+        //        UnityEngine.Debug.LogException(e);
+        //        return false;
+        //    }
+        //}
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Utility/CacheUtil.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Utility/CacheUtil.cs.meta
new file mode 100644
index 0000000..ab8d31b
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Utility/CacheUtil.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 2e5fee0cad7655f458d9b600f4ae6d02
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Utility/CacheUtil.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Utility/FileUtility.cs b/Packages/com.unity.asset-store-tools/Editor/Utility/FileUtility.cs
new file mode 100644
index 0000000..6be5f07
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Utility/FileUtility.cs
@@ -0,0 +1,207 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using UnityEditor;
+
+namespace AssetStoreTools.Utility
+{
+    internal static class FileUtility
+    {
+        private class RenameInfo
+        {
+            public string OriginalName;
+            public string CurrentName;
+        }
+
+        public static string AbsolutePathToRelativePath(string path, bool allowSymlinks)
+        {
+            if (!File.Exists(path) && !Directory.Exists(path))
+                return path;
+
+            string convertedPath = path.Replace("\\", "/");
+
+            var allPackages = PackageUtility.GetAllPackages();
+            foreach (var package in allPackages)
+            {
+                if (Path.GetFullPath(package.resolvedPath) != Path.GetFullPath(convertedPath)
+                    && !Path.GetFullPath(convertedPath).StartsWith(Path.GetFullPath(package.resolvedPath) + Path.DirectorySeparatorChar))
+                    continue;
+
+                convertedPath = Path.GetFullPath(convertedPath)
+                    .Replace(Path.GetFullPath(package.resolvedPath), package.assetPath)
+                    .Replace("\\", "/");
+
+                return convertedPath;
+            }
+
+            if (convertedPath.StartsWith(Constants.RootProjectPath))
+            {
+                convertedPath = convertedPath.Substring(Constants.RootProjectPath.Length);
+            }
+            else
+            {
+                if (allowSymlinks && SymlinkUtil.FindSymlinkFolderRelative(convertedPath, out var symlinkPath))
+                    convertedPath = symlinkPath;
+            }
+
+            return convertedPath;
+        }
+
+        public static void CopyDirectory(string sourceDir, string destinationDir, bool recursive)
+        {
+            // Get information about the source directory
+            var dir = new DirectoryInfo(sourceDir);
+
+            // Check if the source directory exists
+            if (!dir.Exists)
+                throw new DirectoryNotFoundException($"Source directory not found: {dir.FullName}");
+
+            // Cache directories before we start copying
+            DirectoryInfo[] dirs = dir.GetDirectories();
+
+            // Create the destination directory
+            Directory.CreateDirectory(destinationDir);
+
+            // Get the files in the source directory and copy to the destination directory
+            foreach (FileInfo file in dir.GetFiles())
+            {
+                string targetFilePath = Path.Combine(destinationDir, file.Name);
+                file.CopyTo(targetFilePath);
+            }
+
+            // If recursive and copying subdirectories, recursively call this method
+            if (recursive)
+            {
+                foreach (DirectoryInfo subDir in dirs)
+                {
+                    string newDestinationDir = Path.Combine(destinationDir, subDir.Name);
+                    CopyDirectory(subDir.FullName, newDestinationDir, true);
+                }
+            }
+        }
+
+        public static bool ShouldHaveMeta(string assetPath)
+        {
+            if (string.IsNullOrEmpty(assetPath))
+                return false;
+
+            // Meta files never have other metas
+            if (assetPath.EndsWith(".meta", System.StringComparison.OrdinalIgnoreCase))
+                return false;
+
+            // File System entries ending with '~' are hidden in the context of ADB
+            if (assetPath.EndsWith("~"))
+                return false;
+
+            // File System entries whose names start with '.' are hidden in the context of ADB
+            var assetName = assetPath.Replace("\\", "/").Split('/').Last();
+            if (assetName.StartsWith("."))
+                return false;
+
+            return true;
+        }
+
+        public static bool IsMissingMetaFiles(IEnumerable<string> sourcePaths)
+        {
+            foreach (var sourcePath in sourcePaths)
+            {
+                if (!Directory.Exists(sourcePath))
+                    continue;
+
+                var allDirectories = Directory.GetDirectories(sourcePath, "*", SearchOption.AllDirectories);
+                foreach (var dir in allDirectories)
+                {
+                    var dirInfo = new DirectoryInfo(dir);
+                    if (!dirInfo.Name.EndsWith("~"))
+                        continue;
+
+                    var nestedContent = dirInfo.GetFileSystemInfos("*", SearchOption.AllDirectories);
+                    foreach (var nested in nestedContent)
+                    {
+                        if (!ShouldHaveMeta(nested.FullName))
+                            continue;
+
+                        if (!File.Exists(nested.FullName + ".meta"))
+                            return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        public static void GenerateMetaFiles(IEnumerable<string> sourcePaths)
+        {
+            var renameInfos = new List<RenameInfo>();
+
+            foreach (var sourcePath in sourcePaths)
+            {
+                if (!Directory.Exists(sourcePath))
+                    continue;
+
+                var hiddenDirectoriesInPath = Directory.GetDirectories(sourcePath, "*", SearchOption.AllDirectories).Where(x => x.EndsWith("~"));
+                foreach (var hiddenDir in hiddenDirectoriesInPath)
+                {
+                    var hiddenDirRelative = AbsolutePathToRelativePath(hiddenDir, ASToolsPreferences.Instance.EnableSymlinkSupport);
+                    if (!hiddenDirRelative.StartsWith("Assets/") && !hiddenDirRelative.StartsWith("Packages/"))
+                    {
+                        ASDebug.LogWarning($"Path {sourcePath} is not part of the Asset Database and will be skipped");
+                        continue;
+                    }
+
+                    renameInfos.Add(new RenameInfo() { CurrentName = hiddenDirRelative, OriginalName = hiddenDirRelative });
+                }
+            }
+
+            if (renameInfos.Count == 0)
+                return;
+
+            try
+            {
+                EditorApplication.LockReloadAssemblies();
+
+                // Order paths from longest to shortest to avoid having to rename them multiple times
+                renameInfos = renameInfos.OrderByDescending(x => x.OriginalName.Length).ToList();
+
+                try
+                {
+                    AssetDatabase.StartAssetEditing();
+                    foreach (var renameInfo in renameInfos)
+                    {
+                        renameInfo.CurrentName = renameInfo.OriginalName.TrimEnd('~');
+                        Directory.Move(renameInfo.OriginalName, renameInfo.CurrentName);
+                    }
+                }
+                finally
+                {
+                    AssetDatabase.StopAssetEditing();
+                    AssetDatabase.Refresh(ImportAssetOptions.ForceSynchronousImport);
+                    AssetDatabase.ReleaseCachedFileHandles();
+                }
+
+                // Restore the original path names in reverse order
+                renameInfos = renameInfos.OrderBy(x => x.OriginalName.Length).ToList();
+
+                try
+                {
+                    AssetDatabase.StartAssetEditing();
+                    foreach (var renameInfo in renameInfos)
+                    {
+                        Directory.Move(renameInfo.CurrentName, renameInfo.OriginalName);
+                        if (File.Exists($"{renameInfo.CurrentName}.meta"))
+                            File.Delete($"{renameInfo.CurrentName}.meta");
+                    }
+                }
+                finally
+                {
+                    AssetDatabase.StopAssetEditing();
+                    AssetDatabase.Refresh(ImportAssetOptions.ForceSynchronousImport);
+                }
+            }
+            finally
+            {
+                EditorApplication.UnlockReloadAssemblies();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Utility/FileUtility.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Utility/FileUtility.cs.meta
new file mode 100644
index 0000000..fe6eb7c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Utility/FileUtility.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 80819cf6868374d478a8a38ebaba8e27
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Utility/FileUtility.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Utility/LegacyToolsRemover.cs b/Packages/com.unity.asset-store-tools/Editor/Utility/LegacyToolsRemover.cs
new file mode 100644
index 0000000..2b5b169
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Utility/LegacyToolsRemover.cs
@@ -0,0 +1,86 @@
+using System;
+using System.IO;
+using System.Reflection;
+using UnityEditor;
+using UnityEngine;
+
+namespace AssetStoreTools.Utility
+{
+    [InitializeOnLoad]
+    internal class LegacyToolsRemover
+    {
+        private const string MessagePart1 = "A legacy version of Asset Store Tools " +
+            "was detected at the following path:\n";
+        private const string MessagePart2 = "\n\nHaving both the legacy and the latest version installed at the same time is not supported " +
+            "and might prevent the latest version from functioning properly.\n\nWould you like the legacy version to be removed automatically?";
+
+        static LegacyToolsRemover()
+        {
+            try
+            {
+                if (Application.isBatchMode)
+                    return;
+
+                CheckAndRemoveLegacyTools();
+            }
+            catch { }
+        }
+
+        private static void CheckAndRemoveLegacyTools()
+        {
+            if (!ASToolsPreferences.Instance.LegacyVersionCheck || !ProjectContainsLegacyTools(out string path))
+                return;
+
+            var relativePath = path.Substring(Application.dataPath.Length - "Assets".Length).Replace("\\", "/");
+            var result = EditorUtility.DisplayDialog("Asset Store Tools", MessagePart1 + relativePath + MessagePart2, "Yes", "No");
+
+            // If "No" - do nothing
+            if (!result)
+                return;
+
+            // If "Yes" - remove legacy tools
+            File.Delete(path);
+            File.Delete(path + ".meta");
+            RemoveEmptyFolders(Path.GetDirectoryName(path)?.Replace("\\", "/"));
+            AssetDatabase.Refresh();
+
+            // We could also optionally prevent future execution here
+            // but the ProjectContainsLegacyTools() function runs in less
+            // than a milisecond on an empty project
+        }
+
+        private static bool ProjectContainsLegacyTools(out string path)
+        {
+            path = null;
+
+            foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies())
+            {
+                if (assembly.ManifestModule.Name == "AssetStoreTools.dll")
+                {
+                    path = assembly.Location;
+                    break;
+                }
+            }
+
+            if (string.IsNullOrEmpty(path))
+                return false;
+            return true;
+        }
+
+        private static void RemoveEmptyFolders(string directory)
+        {
+            if (directory.EndsWith(Application.dataPath))
+                return;
+
+            if (Directory.GetFiles(directory).Length == 0 && Directory.GetDirectories(directory).Length == 0)
+            {
+                var parentPath = Path.GetDirectoryName(directory).Replace("\\", "/");
+
+                Directory.Delete(directory);
+                File.Delete(directory + ".meta");
+
+                RemoveEmptyFolders(parentPath);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Utility/LegacyToolsRemover.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Utility/LegacyToolsRemover.cs.meta
new file mode 100644
index 0000000..aa03ddf
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Utility/LegacyToolsRemover.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 46ead42026b1f0b4e94153e1a7e10d12
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Utility/LegacyToolsRemover.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Utility/PackageUtility.cs b/Packages/com.unity.asset-store-tools/Editor/Utility/PackageUtility.cs
new file mode 100644
index 0000000..2b6862c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Utility/PackageUtility.cs
@@ -0,0 +1,170 @@
+#if !UNITY_2021_1_OR_NEWER
+using System;
+using System.Reflection;
+#endif
+using Newtonsoft.Json.Linq;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using UnityEditor;
+using UnityEditor.PackageManager;
+using UnityEngine;
+using PackageInfo = UnityEditor.PackageManager.PackageInfo;
+
+namespace AssetStoreTools.Utility
+{
+    internal static class PackageUtility
+    {
+        public class PackageInfoSampleMetadata
+        {
+            public string DisplayName;
+            public string Description;
+            public string Path;
+        }
+
+        public class PackageInfoUnityVersionMetadata
+        {
+            /// <summary>
+            /// Major bit of the Unity version, e.g. 2021.3
+            /// </summary>
+            public string Version;
+            /// <summary>
+            /// Minor bit of the Unity version, e.g. 0f1
+            /// </summary>
+            public string Release;
+
+            public override string ToString()
+            {
+                if (string.IsNullOrEmpty(Version))
+                    return Release;
+
+                if (string.IsNullOrEmpty(Release))
+                    return Release;
+
+                return $"{Version}.{Release}";
+            }
+        }
+
+        /// <summary>
+        /// Returns a package identifier, consisting of package name and package version
+        /// </summary>
+        /// <param name="package"></param>
+        /// <returns></returns>
+        public static string GetPackageIdentifier(this PackageInfo package)
+        {
+            return $"{package.name}-{package.version}";
+        }
+
+        public static PackageInfo[] GetAllPackages()
+        {
+#if !UNITY_2021_1_OR_NEWER
+            var method = typeof(PackageInfo).GetMethod("GetAll", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static, null, new Type[0], null);
+            var packages = method?.Invoke(null, null) as PackageInfo[];
+#else
+            var packages = PackageInfo.GetAllRegisteredPackages();
+#endif
+            return packages;
+        }
+
+        public static PackageInfo[] GetAllLocalPackages()
+        {
+            var packages = GetAllPackages();
+            var localPackages = packages.Where(x => x.source == PackageSource.Embedded || x.source == PackageSource.Local)
+                .Where(x => x.isDirectDependency).ToArray();
+            return localPackages;
+        }
+
+        public static PackageInfo[] GetAllRegistryPackages()
+        {
+            var packages = GetAllPackages();
+            var registryPackages = packages.Where(x => x.source == PackageSource.Registry || x.source == PackageSource.BuiltIn)
+                .OrderBy(x => string.Compare(x.type, "module", System.StringComparison.OrdinalIgnoreCase) == 0)
+                .ThenBy(x => x.name).ToArray();
+
+            return registryPackages;
+        }
+
+        public static bool GetPackageByManifestPath(string packageManifestPath, out PackageInfo package)
+        {
+            package = null;
+
+            if (string.IsNullOrEmpty(packageManifestPath))
+                return false;
+
+            var fileInfo = new FileInfo(packageManifestPath);
+            if (!fileInfo.Exists)
+                return false;
+
+            var allPackages = GetAllPackages();
+
+            package = allPackages.FirstOrDefault(x => Path.GetFullPath(x.resolvedPath).Equals(fileInfo.Directory.FullName));
+            return package != null;
+        }
+
+        public static bool GetPackageByPackageName(string packageName, out PackageInfo package)
+        {
+            package = null;
+
+            if (string.IsNullOrEmpty(packageName))
+                return false;
+
+            return GetPackageByManifestPath($"Packages/{packageName}/package.json", out package);
+        }
+
+        public static TextAsset GetManifestAsset(this PackageInfo packageInfo)
+        {
+            return AssetDatabase.LoadAssetAtPath<TextAsset>($"{packageInfo.assetPath}/package.json");
+        }
+
+        public static List<PackageInfoSampleMetadata> GetSamples(this PackageInfo packageInfo)
+        {
+            var samples = new List<PackageInfoSampleMetadata>();
+
+            var packageManifest = packageInfo.GetManifestAsset();
+            var json = JObject.Parse(packageManifest.text);
+
+            if (!json.ContainsKey("samples") || json["samples"].Type != JTokenType.Array)
+                return samples;
+
+            var sampleList = json["samples"].ToList();
+            foreach (JObject sample in sampleList)
+            {
+                var displayName = string.Empty;
+                var description = string.Empty;
+                var path = string.Empty;
+
+                if (sample.ContainsKey("displayName"))
+                    displayName = sample["displayName"].ToString();
+                if (sample.ContainsKey("description"))
+                    description = sample["description"].ToString();
+                if (sample.ContainsKey("path"))
+                    path = sample["path"].ToString();
+
+                if (!string.IsNullOrEmpty(displayName) || !string.IsNullOrEmpty(description) || !string.IsNullOrEmpty(path))
+                    samples.Add(new PackageInfoSampleMetadata() { DisplayName = displayName, Description = description, Path = path });
+            }
+
+            return samples;
+        }
+
+        public static PackageInfoUnityVersionMetadata GetUnityVersion(this PackageInfo packageInfo)
+        {
+            var packageManifest = packageInfo.GetManifestAsset();
+            var json = JObject.Parse(packageManifest.text);
+
+            var unityVersion = string.Empty;
+            var unityRelease = string.Empty;
+
+            if (json.ContainsKey("unity"))
+                unityVersion = json["unity"].ToString();
+            if (json.ContainsKey("unityRelease"))
+                unityRelease = json["unityRelease"].ToString();
+
+            return new PackageInfoUnityVersionMetadata()
+            {
+                Version = unityVersion,
+                Release = unityRelease
+            };
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Utility/PackageUtility.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Utility/PackageUtility.cs.meta
new file mode 100644
index 0000000..af0b511
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Utility/PackageUtility.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 605ea62f8b11d674a95a53f895df4c67
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Utility/PackageUtility.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Utility/ServiceProvider.cs b/Packages/com.unity.asset-store-tools/Editor/Utility/ServiceProvider.cs
new file mode 100644
index 0000000..919b849
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Utility/ServiceProvider.cs
@@ -0,0 +1,113 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace AssetStoreTools.Utility
+{
+    internal abstract class ServiceProvider<Service>
+    {
+        private Dictionary<Type, Service> _services = new Dictionary<Type, Service>();
+        private Dictionary<Type, Func<Service>> _queuedServices = new Dictionary<Type, Func<Service>>();
+
+        protected class MissingServiceDependencyException : Exception
+        {
+            public Type ServiceType { get; private set; }
+            public Type MissingDependencyType { get; private set; }
+
+            public MissingServiceDependencyException(Type serviceType, Type missingDependencyType)
+            {
+                ServiceType = serviceType;
+                MissingDependencyType = missingDependencyType;
+            }
+        }
+
+        protected ServiceProvider()
+        {
+            RegisterServices();
+            CreateRegisteredServices();
+        }
+
+        protected abstract void RegisterServices();
+
+        protected void Register<TService, TInstance>() where TService : Service where TInstance : TService
+        {
+            Register<TService>(() => CreateServiceInstance(typeof(TInstance)));
+        }
+
+        protected void Register<TService>(Func<Service> initializer) where TService : Service
+        {
+            _queuedServices.Add(typeof(TService), initializer);
+        }
+
+        private void CreateRegisteredServices()
+        {
+            if (_queuedServices.Count == 0)
+                return;
+
+            var createdAnyService = false;
+            var missingServices = new List<MissingServiceDependencyException>();
+
+            foreach (var service in _queuedServices)
+            {
+                try
+                {
+                    var instance = service.Value.Invoke();
+                    _services.Add(service.Key, instance);
+                    createdAnyService = true;
+                }
+                catch (MissingServiceDependencyException e)
+                {
+                    missingServices.Add(e);
+                }
+            }
+
+            foreach (var createdService in _services)
+            {
+                _queuedServices.Remove(createdService.Key);
+            }
+
+            if (!createdAnyService)
+            {
+                var message = string.Join(", ", missingServices.Select(x => $"{x.ServiceType} depends on {x.MissingDependencyType}"));
+                throw new Exception("Could not create the following services due to missing dependencies: " + message);
+            }
+
+            // Recursively register remaining queued services that may have failed
+            // due to missing depenedencies that are now registered
+            CreateRegisteredServices();
+        }
+
+        private Service CreateServiceInstance(Type concreteType)
+        {
+            if (concreteType.IsAbstract)
+                throw new Exception($"Cannot create an instance of an abstract class {concreteType}");
+
+            var constructor = concreteType.GetConstructors().First();
+            var expectedParameters = constructor.GetParameters();
+            var parametersToUse = new List<object>();
+
+            foreach (var parameter in expectedParameters)
+            {
+                if (!_services.ContainsKey(parameter.ParameterType))
+                    throw new MissingServiceDependencyException(concreteType, parameter.ParameterType);
+
+                parametersToUse.Add(_services[parameter.ParameterType]);
+            }
+
+            return (Service)constructor.Invoke(parametersToUse.ToArray());
+        }
+
+        public T GetService<T>() where T : Service
+        {
+            return (T)GetService(typeof(T));
+        }
+
+        public object GetService(Type type)
+        {
+            if (!_services.ContainsKey(type))
+                throw new Exception($"Service of type {type} is not registered");
+
+            return _services[type];
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Utility/ServiceProvider.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Utility/ServiceProvider.cs.meta
new file mode 100644
index 0000000..a35f4c8
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Utility/ServiceProvider.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 2fcadafa6431d1647a82d35e6e4a13c5
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Utility/ServiceProvider.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Utility/StyleSelector.cs b/Packages/com.unity.asset-store-tools/Editor/Utility/StyleSelector.cs
new file mode 100644
index 0000000..faf7665
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Utility/StyleSelector.cs
@@ -0,0 +1,55 @@
+using System;
+using UnityEditor;
+using UnityEngine.UIElements;
+using WindowStyles = AssetStoreTools.Constants.WindowStyles;
+
+namespace AssetStoreTools.Utility
+{
+    internal static class StyleSelector
+    {
+        private static StyleSheet GetStylesheet(string rootPath, string filePath)
+        {
+            var path = $"{rootPath}/{filePath}.uss";
+            var sheet = AssetDatabase.LoadAssetAtPath<StyleSheet>(path);
+            if (sheet == null)
+                throw new Exception($"Stylesheet '{path}' was not found");
+            return sheet;
+        }
+
+        private static StyleSheet GetStylesheetTheme(string rootPath, string filePath)
+        {
+            var suffix = !EditorGUIUtility.isProSkin ? "Light" : "Dark";
+            return GetStylesheet(rootPath, filePath + suffix);
+        }
+
+        public static class UploaderWindow
+        {
+            public static StyleSheet UploaderWindowStyle => GetStylesheet(WindowStyles.UploaderStylesPath, "Style");
+            public static StyleSheet UploaderWindowTheme => GetStylesheetTheme(WindowStyles.UploaderStylesPath, "Theme");
+
+            public static StyleSheet LoginViewStyle => GetStylesheet(WindowStyles.UploaderStylesPath, "LoginView/Style");
+            public static StyleSheet LoginViewTheme => GetStylesheetTheme(WindowStyles.UploaderStylesPath, "LoginView/Theme");
+
+            public static StyleSheet PackageListViewStyle => GetStylesheet(WindowStyles.UploaderStylesPath, "PackageListView/Style");
+            public static StyleSheet PackageListViewTheme => GetStylesheetTheme(WindowStyles.UploaderStylesPath, "PackageListView/Theme");
+        }
+
+        public static class ValidatorWindow
+        {
+            public static StyleSheet ValidatorWindowStyle => GetStylesheet(WindowStyles.ValidatorStylesPath, "Style");
+            public static StyleSheet ValidatorWindowTheme => GetStylesheetTheme(WindowStyles.ValidatorStylesPath, "Theme");
+        }
+
+        public static class PreviewGeneratorWindow
+        {
+            public static StyleSheet PreviewGeneratorWindowStyle => GetStylesheet(WindowStyles.PreviewGeneratorStylesPath, "Style");
+            public static StyleSheet PreviewGeneratorWindowTheme => GetStylesheetTheme(WindowStyles.PreviewGeneratorStylesPath, "Theme");
+        }
+
+        public static class UpdaterWindow
+        {
+            public static StyleSheet UpdaterWindowStyle => GetStylesheet(WindowStyles.UpdaterStylesPath, "Style");
+            public static StyleSheet UpdaterWindowTheme => GetStylesheetTheme(WindowStyles.UpdaterStylesPath, "Theme");
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Utility/StyleSelector.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Utility/StyleSelector.cs.meta
new file mode 100644
index 0000000..b7a9bb2
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Utility/StyleSelector.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 8b066ce502a289a4ca311a86fbf83f45
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Utility/StyleSelector.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Utility/Styles.meta b/Packages/com.unity.asset-store-tools/Editor/Utility/Styles.meta
new file mode 100644
index 0000000..0175b81
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Utility/Styles.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f730eb0b8c48c434d93cc60a0b8aff40
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Utility/Styles/Updater.meta b/Packages/com.unity.asset-store-tools/Editor/Utility/Styles/Updater.meta
new file mode 100644
index 0000000..315b99b
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Utility/Styles/Updater.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5367435d9abe935438f4d7b588a55488
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/Style.uss b/Packages/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/Style.uss
new file mode 100644
index 0000000..afcdd3e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/Style.uss
@@ -0,0 +1,76 @@
+.updater-loading-container {
+	flex-grow: 1;
+	align-items: center;
+	justify-content: center;
+}
+
+.updater-loading-container > Image {
+	width: 16px;
+	height: 16px;
+}
+
+.updater-info-container {
+	flex-grow: 1;
+	margin: 0 5px 5px 5px;
+}
+
+.updater-info-container-labels {
+	flex-grow: 1;
+	margin-bottom: 10px;
+	margin-top: 5px;
+}
+
+.updater-info-container-labels-description {
+	flex-grow: 0.5;
+	margin-bottom: 5px;
+	white-space: normal;
+	-unity-text-align: middle-left;
+}
+
+.updater-info-container-labels-row {
+	flex-direction: row;
+}
+
+.updater-info-container-labels-row-identifier {
+	-unity-font-style: bold;
+}
+
+.updater-info-container-buttons {
+	flex-direction: row;
+	margin-bottom: 5px;
+}
+
+.updater-info-container-buttons > Button {
+	flex-grow: 1;
+	flex-shrink: 1;
+	flex-basis: 100%;
+	height: 25px;
+}
+
+.updater-info-container-toggle {
+	align-self: flex-end;
+}
+
+.updater-info-container-toggle > Toggle > VisualElement > Label {
+	margin-left: 5px;
+}
+
+.updater-fail-container {
+	flex-grow: 1;
+	flex-direction: row;
+	margin: 0 5px 5px 5px;
+	justify-content: center;
+	align-items: center;
+}
+
+.updater-fail-container > Image {
+	flex-shrink: 0;
+	width: 36px;
+	height: 36px;
+	margin-right: 5px;
+}
+
+.updater-fail-container > Label {
+	flex-shrink: 1;
+	white-space: normal;
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/Style.uss.meta b/Packages/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/Style.uss.meta
new file mode 100644
index 0000000..a2dbb90
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/Style.uss.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 23112eed1f211274c94028490f81007c
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/Style.uss
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/ThemeDark.uss b/Packages/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/ThemeDark.uss
new file mode 100644
index 0000000..a0f11f8
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/ThemeDark.uss
@@ -0,0 +1,3 @@
+.updater-fail-container > Image {
+	--unity-image: resource("console.erroricon@2x");
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/ThemeDark.uss.meta b/Packages/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/ThemeDark.uss.meta
new file mode 100644
index 0000000..82e770e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/ThemeDark.uss.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 0cbf43b8dabcd1242b32ed3ed2167a54
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/ThemeDark.uss
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/ThemeLight.uss b/Packages/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/ThemeLight.uss
new file mode 100644
index 0000000..a0f11f8
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/ThemeLight.uss
@@ -0,0 +1,3 @@
+.updater-fail-container > Image {
+	--unity-image: resource("console.erroricon@2x");
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/ThemeLight.uss.meta b/Packages/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/ThemeLight.uss.meta
new file mode 100644
index 0000000..cdd5b1a
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/ThemeLight.uss.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: d453bb92cd1f35943b1c5f652837ada9
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Utility/Styles/Updater/ThemeLight.uss
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Utility/SymlinkUtil.cs b/Packages/com.unity.asset-store-tools/Editor/Utility/SymlinkUtil.cs
new file mode 100644
index 0000000..fb2d435
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Utility/SymlinkUtil.cs
@@ -0,0 +1,67 @@
+using System.IO;
+
+namespace AssetStoreTools.Utility
+{
+    internal static class SymlinkUtil
+    {
+        private const FileAttributes FolderSymlinkAttributes = FileAttributes.Directory | FileAttributes.ReparsePoint;
+
+        public static bool FindSymlinkFolderRelative(string folderPathAbsolute, out string relativePath)
+        {
+            // Get directory info for path outside of the project
+            var absoluteInfo = new DirectoryInfo(folderPathAbsolute);
+
+            // Get all directories within the project
+            var allFolderPaths = Directory.GetDirectories("Assets", "*", SearchOption.AllDirectories);
+            foreach (var path in allFolderPaths)
+            {
+                var fullPath = path.Replace("\\", "/");
+
+                // Get directory info for one of the paths within the project
+                var relativeInfo = new DirectoryInfo(fullPath);
+
+                // Check if project's directory is a symlink
+                if (!relativeInfo.Attributes.HasFlag(FolderSymlinkAttributes))
+                    continue;
+
+                // Compare metadata of outside directory with a directories within the project
+                if (!CompareDirectories(absoluteInfo, relativeInfo))
+                    continue;
+
+                // Found symlink within the project, assign it
+                relativePath = fullPath;
+                return true;
+            }
+
+            relativePath = string.Empty;
+            return false;
+        }
+
+        private static bool CompareDirectories(DirectoryInfo directory, DirectoryInfo directory2)
+        {
+            var contents = directory.EnumerateFileSystemInfos("*", SearchOption.AllDirectories).GetEnumerator();
+            var contents2 = directory2.EnumerateFileSystemInfos("*", SearchOption.AllDirectories).GetEnumerator();
+
+            while (true)
+            {
+                var firstNext = contents.MoveNext();
+                var secondNext = contents2.MoveNext();
+
+                if (firstNext != secondNext)
+                    return false;
+
+                if (!firstNext && !secondNext)
+                    break;
+
+                var equals = contents.Current?.Name == contents2.Current?.Name
+                             && contents.Current?.LastWriteTime == contents2.Current?.LastWriteTime;
+
+                if (!equals)
+                    return false;
+            }
+
+            return true;
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Utility/SymlinkUtil.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Utility/SymlinkUtil.cs.meta
new file mode 100644
index 0000000..827d9ce
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Utility/SymlinkUtil.cs.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 92092535fd064bb1843017f98db213e1
+timeCreated: 1659013521
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Utility/SymlinkUtil.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator.meta b/Packages/com.unity.asset-store-tools/Editor/Validator.meta
new file mode 100644
index 0000000..e27c1ef
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 980c7bb65c02d464684c2220c57fcd75
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Icons.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons.meta
new file mode 100644
index 0000000..7f4c321
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8490c57c02b441e4dab99565da835c99
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/error.png b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/error.png
new file mode 100644
index 0000000..8d294bc
Binary files /dev/null and b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/error.png differ
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/error.png.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/error.png.meta
new file mode 100644
index 0000000..3831146
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/error.png.meta
@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 0cc0ccdb7de3e964ab553ce3c299d83c
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 2
+    aniso: 0
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 0
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Icons/error.png
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/error_d.png b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/error_d.png
new file mode 100644
index 0000000..451f640
Binary files /dev/null and b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/error_d.png differ
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/error_d.png.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/error_d.png.meta
new file mode 100644
index 0000000..07c06d2
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/error_d.png.meta
@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: cdf8d51df19d58341886cc474e810c7b
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 2
+    aniso: 0
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 0
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Icons/error_d.png
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/success.png b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/success.png
new file mode 100644
index 0000000..a5f7853
Binary files /dev/null and b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/success.png differ
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/success.png.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/success.png.meta
new file mode 100644
index 0000000..e883152
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/success.png.meta
@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 832e106a677623145b3d8dbe015e31a0
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 2
+    aniso: 0
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 0
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Icons/success.png
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/success_d.png b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/success_d.png
new file mode 100644
index 0000000..094a810
Binary files /dev/null and b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/success_d.png differ
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/success_d.png.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/success_d.png.meta
new file mode 100644
index 0000000..f2240b9
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/success_d.png.meta
@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 3dc139a2b2a28a54a8f39e266fc0af9c
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 2
+    aniso: 0
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 0
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Icons/success_d.png
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/undefined.png b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/undefined.png
new file mode 100644
index 0000000..a587baa
Binary files /dev/null and b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/undefined.png differ
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/undefined.png.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/undefined.png.meta
new file mode 100644
index 0000000..4911cd6
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/undefined.png.meta
@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 4a4eef842709db34cbb71baf22384730
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 2
+    aniso: 0
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 0
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Icons/undefined.png
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/undefined_d.png b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/undefined_d.png
new file mode 100644
index 0000000..b7e2681
Binary files /dev/null and b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/undefined_d.png differ
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/undefined_d.png.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/undefined_d.png.meta
new file mode 100644
index 0000000..f87e127
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/undefined_d.png.meta
@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 88a36c7e4d60b6b4385c95cfc2d00c22
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 2
+    aniso: 0
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 0
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Icons/undefined_d.png
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/warning.png b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/warning.png
new file mode 100644
index 0000000..aab9fee
Binary files /dev/null and b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/warning.png differ
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/warning.png.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/warning.png.meta
new file mode 100644
index 0000000..efc2077
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/warning.png.meta
@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 83d0e58aa5f608a4b8232fbacca5ca89
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 2
+    aniso: 0
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 0
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Icons/warning.png
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/warning_d.png b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/warning_d.png
new file mode 100644
index 0000000..553bb16
Binary files /dev/null and b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/warning_d.png differ
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/warning_d.png.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/warning_d.png.meta
new file mode 100644
index 0000000..c757847
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Icons/warning_d.png.meta
@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: d27d359f48fa1a14e9e4f02196589805
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 2
+    aniso: 0
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 0
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Icons/warning_d.png
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts.meta
new file mode 100644
index 0000000..5a81535
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1b5ff7c95381e82438f6c9dc40069031
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Categories.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Categories.meta
new file mode 100644
index 0000000..0c29f2c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Categories.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 7a971a9a200a4438945853d71066f16a
+timeCreated: 1657617558
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Categories/CategoryEvaluator.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Categories/CategoryEvaluator.cs
new file mode 100644
index 0000000..3493505
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Categories/CategoryEvaluator.cs
@@ -0,0 +1,52 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.TestDefinitions;
+
+namespace AssetStoreTools.Validator.Categories
+{
+    internal class CategoryEvaluator
+    {
+        private string _category;
+
+        public CategoryEvaluator(string category)
+        {
+            if (string.IsNullOrEmpty(category))
+                _category = string.Empty;
+            else
+                _category = category;
+        }
+
+        public void SetCategory(string category)
+        {
+            if (category == null)
+                _category = string.Empty;
+            else
+                _category = category;
+        }
+
+        public string GetCategory()
+        {
+            return _category;
+        }
+
+        public TestResultStatus Evaluate(ValidationTest validation, bool slugify = false)
+        {
+            var result = validation.Result.Status;
+            if (result != TestResultStatus.VariableSeverityIssue)
+                return result;
+
+            var category = _category;
+
+            if (slugify)
+                category = validation.Slugify(category);
+
+            return validation.CategoryInfo.EvaluateByFilter(category);
+        }
+
+#if AB_BUILDER
+        public TestResultStatus EvaluateAndSlugify(ValidationTest validation)
+        {
+            return Evaluate(validation, true);
+        }
+#endif
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Categories/CategoryEvaluator.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Categories/CategoryEvaluator.cs.meta
new file mode 100644
index 0000000..252079d
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Categories/CategoryEvaluator.cs.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: eb61fd62b94248e4b5a3a07665b1a2bf
+timeCreated: 1661420659
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Categories/CategoryEvaluator.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Categories/ValidatorCategory.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Categories/ValidatorCategory.cs
new file mode 100644
index 0000000..f1619e6
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Categories/ValidatorCategory.cs
@@ -0,0 +1,38 @@
+using AssetStoreTools.Validator.Data;
+using System;
+using System.Linq;
+
+namespace AssetStoreTools.Validator.Categories
+{
+    [System.Serializable]
+    internal class ValidatorCategory
+    {
+        public bool IsFailFilter = false;
+        public bool IsInclusiveFilter = true;
+        public bool AppliesToSubCategories = true;
+        public string[] Filter = { "Tools", "Art" };
+
+        public TestResultStatus EvaluateByFilter(string category)
+        {
+            if (AppliesToSubCategories)
+                category = category.Split('/')[0];
+
+            var isCategoryInFilter = Filter.Any(x => String.Compare(x, category, StringComparison.OrdinalIgnoreCase) == 0);
+
+            if (IsInclusiveFilter)
+            {
+                if (isCategoryInFilter)
+                    return IsFailFilter ? TestResultStatus.Fail : TestResultStatus.Warning;
+                else
+                    return IsFailFilter ? TestResultStatus.Warning : TestResultStatus.Fail;
+            }
+            else
+            {
+                if (isCategoryInFilter)
+                    return IsFailFilter ? TestResultStatus.Warning : TestResultStatus.Fail;
+                else
+                    return IsFailFilter ? TestResultStatus.Fail : TestResultStatus.Warning;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Categories/ValidatorCategory.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Categories/ValidatorCategory.cs.meta
new file mode 100644
index 0000000..84e5678
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Categories/ValidatorCategory.cs.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: a5e60d3639f24063a4eabc21ea1a04a9
+timeCreated: 1657617578
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Categories/ValidatorCategory.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/CurrentProjectValidator.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/CurrentProjectValidator.cs
new file mode 100644
index 0000000..1fbc6ba
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/CurrentProjectValidator.cs
@@ -0,0 +1,71 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.TestDefinitions;
+using System;
+using System.IO;
+
+namespace AssetStoreTools.Validator
+{
+    internal class CurrentProjectValidator : ValidatorBase
+    {
+        private CurrentProjectValidationSettings _settings;
+
+        public CurrentProjectValidator(CurrentProjectValidationSettings settings) : base(settings)
+        {
+            _settings = settings;
+        }
+
+        protected override void ValidateSettings()
+        {
+            if (_settings == null)
+                throw new Exception("Validation Settings is null");
+
+            if (_settings.ValidationPaths == null
+                || _settings.ValidationPaths.Count == 0)
+                throw new Exception("No validation paths were set");
+
+            switch (_settings.ValidationType)
+            {
+                case ValidationType.Generic:
+                case ValidationType.UnityPackage:
+                    ValidateUnityPackageSettings();
+                    break;
+                default:
+                    throw new NotImplementedException("Undefined validation type");
+            }
+        }
+
+        private void ValidateUnityPackageSettings()
+        {
+            var invalidPaths = string.Empty;
+            foreach (var path in _settings.ValidationPaths)
+            {
+                if (!Directory.Exists(path))
+                    invalidPaths += $"\n{path}";
+            }
+
+            if (!string.IsNullOrEmpty(invalidPaths))
+                throw new Exception("The following directories do not exist:" + invalidPaths);
+        }
+
+        protected override ValidationResult GenerateValidationResult()
+        {
+            ITestConfig config;
+            var applicableTests = GetApplicableTests(ValidationType.Generic);
+            switch (_settings.ValidationType)
+            {
+                case ValidationType.Generic:
+                    config = new GenericTestConfig() { ValidationPaths = _settings.ValidationPaths.ToArray() };
+                    break;
+                case ValidationType.UnityPackage:
+                    applicableTests.AddRange(GetApplicableTests(ValidationType.UnityPackage));
+                    config = new GenericTestConfig() { ValidationPaths = _settings.ValidationPaths.ToArray() };
+                    break;
+                default:
+                    return new ValidationResult() { Status = ValidationStatus.Failed, Exception = new Exception("Undefined validation type") };
+            }
+
+            var validationResult = RunTests(applicableTests, config);
+            return validationResult;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/CurrentProjectValidator.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/CurrentProjectValidator.cs.meta
new file mode 100644
index 0000000..16fe73b
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/CurrentProjectValidator.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 3a6371dcfa8545c478545b4a43433599
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/CurrentProjectValidator.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data.meta
new file mode 100644
index 0000000..3b40063
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1c2a38ded8e054c4088aff1db7224f66
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/CurrentProjectValidationSettings.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/CurrentProjectValidationSettings.cs
new file mode 100644
index 0000000..446c73c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/CurrentProjectValidationSettings.cs
@@ -0,0 +1,33 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace AssetStoreTools.Validator.Data
+{
+    internal class CurrentProjectValidationSettings : ValidationSettings
+    {
+        public List<string> ValidationPaths;
+        public ValidationType ValidationType;
+
+        public CurrentProjectValidationSettings()
+        {
+            Category = string.Empty;
+            ValidationPaths = new List<string>();
+        }
+
+        public override int GetHashCode()
+        {
+            return base.GetHashCode();
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (obj == null || obj.GetType() != typeof(CurrentProjectValidationSettings))
+                return false;
+
+            var other = (CurrentProjectValidationSettings)obj;
+            return Category == other.Category
+                && ValidationType == other.ValidationType
+                && ValidationPaths.OrderBy(x => x).SequenceEqual(other.ValidationPaths.OrderBy(x => x));
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/CurrentProjectValidationSettings.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/CurrentProjectValidationSettings.cs.meta
new file mode 100644
index 0000000..a1a9935
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/CurrentProjectValidationSettings.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 9e4a4a4aa3f501847b1abb1e08505f9b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/CurrentProjectValidationSettings.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ExternalProjectValidationSettings.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ExternalProjectValidationSettings.cs
new file mode 100644
index 0000000..f4a85f3
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ExternalProjectValidationSettings.cs
@@ -0,0 +1,7 @@
+namespace AssetStoreTools.Validator.Data
+{
+    internal class ExternalProjectValidationSettings : ValidationSettings
+    {
+        public string PackagePath;
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ExternalProjectValidationSettings.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ExternalProjectValidationSettings.cs.meta
new file mode 100644
index 0000000..4b1d4fc
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ExternalProjectValidationSettings.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: f79c895f4bb099b4983dd20eef72a7bd
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ExternalProjectValidationSettings.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/MessageActions.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/MessageActions.meta
new file mode 100644
index 0000000..7f0bd9a
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/MessageActions.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d51c5c866dcd449488caa10a40dd3301
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/MessageActions/HighlightObjectAction.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/MessageActions/HighlightObjectAction.cs
new file mode 100644
index 0000000..932b607
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/MessageActions/HighlightObjectAction.cs
@@ -0,0 +1,31 @@
+using Newtonsoft.Json;
+using UnityEditor;
+using UnityEngine;
+
+namespace AssetStoreTools.Validator.Data.MessageActions
+{
+    internal class HighlightObjectAction : IMessageAction
+    {
+        public string Tooltip => "Click to highlight the associated object in Hierarchy/Project view";
+        public Object Target => _target?.GetObject();
+
+        [JsonProperty]
+        private TestResultObject _target;
+
+        public HighlightObjectAction() { }
+
+        public HighlightObjectAction(Object target)
+        {
+            _target = new TestResultObject(target);
+        }
+
+        public void Execute()
+        {
+            var targetObject = _target.GetObject();
+            if (targetObject == null)
+                return;
+
+            EditorGUIUtility.PingObject(targetObject);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/MessageActions/HighlightObjectAction.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/MessageActions/HighlightObjectAction.cs.meta
new file mode 100644
index 0000000..7df75ca
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/MessageActions/HighlightObjectAction.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: de24c0a7f8a22c142a224e6abd0ddc68
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/MessageActions/HighlightObjectAction.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/MessageActions/IMessageAction.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/MessageActions/IMessageAction.cs
new file mode 100644
index 0000000..4e5e887
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/MessageActions/IMessageAction.cs
@@ -0,0 +1,16 @@
+using Newtonsoft.Json;
+using UnityEngine;
+
+namespace AssetStoreTools.Validator.Data.MessageActions
+{
+    internal interface IMessageAction
+    {
+        [JsonIgnore]
+        string Tooltip { get; }
+
+        [JsonIgnore]
+        Object Target { get; }
+
+        void Execute();
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/MessageActions/IMessageAction.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/MessageActions/IMessageAction.cs.meta
new file mode 100644
index 0000000..a1c2bfa
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/MessageActions/IMessageAction.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: f1636d7241abdf1498368f841aa818a2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/MessageActions/IMessageAction.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/MessageActions/OpenAssetAction.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/MessageActions/OpenAssetAction.cs
new file mode 100644
index 0000000..c505aac
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/MessageActions/OpenAssetAction.cs
@@ -0,0 +1,38 @@
+using Newtonsoft.Json;
+using UnityEditor;
+using UnityEngine;
+
+namespace AssetStoreTools.Validator.Data.MessageActions
+{
+    internal class OpenAssetAction : IMessageAction
+    {
+        public string Tooltip => "Click to open the associated asset";
+        public Object Target => _target?.GetObject();
+
+        [JsonProperty]
+        private TestResultObject _target;
+        [JsonProperty]
+        private int _lineNumber;
+
+        public OpenAssetAction() { }
+
+        public OpenAssetAction(Object target)
+        {
+            _target = new TestResultObject(target);
+        }
+
+        public OpenAssetAction(Object target, int lineNumber) : this(target)
+        {
+            _lineNumber = lineNumber;
+        }
+
+        public void Execute()
+        {
+            var targetObject = _target.GetObject();
+            if (targetObject == null)
+                return;
+
+            AssetDatabase.OpenAsset(targetObject, _lineNumber);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/MessageActions/OpenAssetAction.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/MessageActions/OpenAssetAction.cs.meta
new file mode 100644
index 0000000..257d758
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/MessageActions/OpenAssetAction.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 9fb4fec293bf73f4a8f870c535750613
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/MessageActions/OpenAssetAction.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/TestResult.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/TestResult.cs
new file mode 100644
index 0000000..6f40c5d
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/TestResult.cs
@@ -0,0 +1,52 @@
+using AssetStoreTools.Validator.Data.MessageActions;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace AssetStoreTools.Validator.Data
+{
+    internal struct TestResult
+    {
+        public TestResultStatus Status;
+
+        [JsonProperty]
+        private List<TestResultMessage> _messages;
+
+        [JsonIgnore]
+        public int MessageCount => _messages != null ? _messages.Count : 0;
+
+        public TestResultMessage GetMessage(int index)
+        {
+            return _messages[index];
+        }
+
+        public void AddMessage(string msg)
+        {
+            AddMessage(msg, null, null);
+        }
+
+        public void AddMessage(string msg, IMessageAction clickAction)
+        {
+            AddMessage(msg, clickAction, null);
+        }
+
+        public void AddMessage(string msg, IMessageAction clickAction, params UnityEngine.Object[] messageObjects)
+        {
+            if (_messages == null)
+                _messages = new List<TestResultMessage>();
+
+            var message = new TestResultMessage(msg, clickAction);
+            _messages.Add(message);
+
+            if (messageObjects == null)
+                return;
+
+            foreach (var obj in messageObjects)
+            {
+                if (obj == null)
+                    continue;
+
+                message.AddMessageObject(obj);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/TestResult.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/TestResult.cs.meta
new file mode 100644
index 0000000..6aea010
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/TestResult.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 05d7d92bbda6bf44f8ed5fbd0cde57e6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/TestResult.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/TestResultMessage.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/TestResultMessage.cs
new file mode 100644
index 0000000..d524cb0
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/TestResultMessage.cs
@@ -0,0 +1,53 @@
+using AssetStoreTools.Validator.Data.MessageActions;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+using Object = UnityEngine.Object;
+
+namespace AssetStoreTools.Validator.Data
+{
+    internal class TestResultMessage
+    {
+        [JsonIgnore]
+        public int MessageObjectCount => _messageObjects.Count;
+
+        [JsonProperty]
+        private string _text;
+        [JsonProperty]
+        private List<TestResultObject> _messageObjects;
+        [JsonProperty]
+        private IMessageAction _clickAction;
+
+        public TestResultMessage() { }
+
+        public TestResultMessage(string text)
+        {
+            _text = text;
+            _messageObjects = new List<TestResultObject>();
+        }
+
+        public TestResultMessage(string text, IMessageAction clickAction) : this(text)
+        {
+            _clickAction = clickAction;
+        }
+
+        public string GetText()
+        {
+            return _text;
+        }
+
+        public IMessageAction GetClickAction()
+        {
+            return _clickAction;
+        }
+
+        public void AddMessageObject(Object obj)
+        {
+            _messageObjects.Add(new TestResultObject(obj));
+        }
+
+        public TestResultObject GetMessageObject(int index)
+        {
+            return _messageObjects[index];
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/TestResultMessage.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/TestResultMessage.cs.meta
new file mode 100644
index 0000000..eaab519
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/TestResultMessage.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 0761356c44140ca49917f93b42926471
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/TestResultMessage.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/TestResultObject.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/TestResultObject.cs
new file mode 100644
index 0000000..8fa7019
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/TestResultObject.cs
@@ -0,0 +1,35 @@
+using Newtonsoft.Json;
+using UnityEditor;
+using UnityEngine;
+
+namespace AssetStoreTools.Validator.Data
+{
+    internal class TestResultObject
+    {
+        [JsonIgnore]
+        private Object _object;
+        [JsonProperty]
+        private string _objectGlobalId;
+
+        public TestResultObject(Object obj)
+        {
+            _object = obj;
+            _objectGlobalId = GlobalObjectId.GetGlobalObjectIdSlow(obj).ToString();
+        }
+
+        public Object GetObject()
+        {
+            if (_object != null)
+                return _object;
+
+            if (string.IsNullOrEmpty(_objectGlobalId))
+                return null;
+
+            if (!GlobalObjectId.TryParse(_objectGlobalId, out var globalObject))
+                return null;
+
+            _object = GlobalObjectId.GlobalObjectIdentifierToObjectSlow(globalObject);
+            return _object;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/TestResultObject.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/TestResultObject.cs.meta
new file mode 100644
index 0000000..414f1e2
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/TestResultObject.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: acce8e477b7fe2c4aa430ebdd65ea7d1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/TestResultObject.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/TestResultStatus.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/TestResultStatus.cs
new file mode 100644
index 0000000..e304859
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/TestResultStatus.cs
@@ -0,0 +1,11 @@
+namespace AssetStoreTools.Validator.Data
+{
+    internal enum TestResultStatus
+    {
+        Undefined = 0,
+        Pass = 1,
+        Fail = 2,
+        Warning = 3,
+        VariableSeverityIssue = 4
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/TestResultStatus.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/TestResultStatus.cs.meta
new file mode 100644
index 0000000..118669e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/TestResultStatus.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: eef1ba0cf35f1304d8929e23b94e7c23
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/TestResultStatus.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ValidationResult.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ValidationResult.cs
new file mode 100644
index 0000000..2ee0c43
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ValidationResult.cs
@@ -0,0 +1,24 @@
+using AssetStoreTools.Validator.TestDefinitions;
+using System;
+using System.Collections.Generic;
+
+namespace AssetStoreTools.Validator.Data
+{
+    internal class ValidationResult
+    {
+        public ValidationStatus Status;
+        public bool HadCompilationErrors;
+        public string ProjectPath;
+        public List<AutomatedTest> Tests;
+        public Exception Exception;
+
+        public ValidationResult()
+        {
+            Status = ValidationStatus.NotRun;
+            HadCompilationErrors = false;
+            ProjectPath = string.Empty;
+            Tests = new List<AutomatedTest>();
+            Exception = null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ValidationResult.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ValidationResult.cs.meta
new file mode 100644
index 0000000..cb5e9c3
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ValidationResult.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: b15525b8dcf3e654ca2f895472ab7cb1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ValidationResult.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ValidationSettings.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ValidationSettings.cs
new file mode 100644
index 0000000..8747266
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ValidationSettings.cs
@@ -0,0 +1,7 @@
+namespace AssetStoreTools.Validator.Data
+{
+    internal abstract class ValidationSettings
+    {
+        public string Category;
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ValidationSettings.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ValidationSettings.cs.meta
new file mode 100644
index 0000000..4afa08f
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ValidationSettings.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 33e99d6b6e1e7ef4abd6cd2c0137741a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ValidationSettings.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ValidationStatus.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ValidationStatus.cs
new file mode 100644
index 0000000..385bb92
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ValidationStatus.cs
@@ -0,0 +1,10 @@
+namespace AssetStoreTools.Validator.Data
+{
+    internal enum ValidationStatus
+    {
+        NotRun,
+        RanToCompletion,
+        Failed,
+        Cancelled
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ValidationStatus.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ValidationStatus.cs.meta
new file mode 100644
index 0000000..dbb0e8c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ValidationStatus.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: a1f1e1e94faa6284f8d71804ba2bbd24
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ValidationStatus.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ValidationType.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ValidationType.cs
new file mode 100644
index 0000000..964602c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ValidationType.cs
@@ -0,0 +1,8 @@
+namespace AssetStoreTools.Validator.Data
+{
+    internal enum ValidationType
+    {
+        Generic = 0,
+        UnityPackage = 1
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ValidationType.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ValidationType.cs.meta
new file mode 100644
index 0000000..88f9f2a
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ValidationType.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 079f8963464230145853d86eff935e04
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Data/ValidationType.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/ExternalProjectValidator.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/ExternalProjectValidator.cs
new file mode 100644
index 0000000..c38c51d
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/ExternalProjectValidator.cs
@@ -0,0 +1,259 @@
+using AssetStoreTools.Utility;
+using AssetStoreTools.Validator.Data;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using UnityEditor;
+using UnityEngine;
+
+namespace AssetStoreTools.Validator
+{
+    internal class ExternalProjectValidator : ValidatorBase
+    {
+        private ExternalProjectValidationSettings _settings;
+
+        public ExternalProjectValidator(ExternalProjectValidationSettings settings) : base(settings)
+        {
+            _settings = settings;
+        }
+
+        protected override void ValidateSettings()
+        {
+            if (_settings == null)
+                throw new Exception("Validation Settings is null");
+
+            if (string.IsNullOrEmpty(_settings.PackagePath)
+                || !File.Exists(_settings.PackagePath))
+                throw new Exception("Package was not found");
+        }
+
+        protected override ValidationResult GenerateValidationResult()
+        {
+            bool interactiveMode = false;
+            try
+            {
+                // Step 1 - prepare a temporary project
+                var result = PrepareTemporaryValidationProject(interactiveMode);
+
+                // If preparation was cancelled or setting up project failed - return immediately
+                if (result.Status == ValidationStatus.Cancelled || result.Status == ValidationStatus.Failed)
+                    return result;
+
+                // Step 2 - load the temporary project and validate the package
+                result = ValidateTemporaryValidationProject(result, interactiveMode);
+
+                // Step 3 - copy validation results
+                result = ParseValidationResult(result.ProjectPath);
+
+                return result;
+            }
+            catch (Exception e)
+            {
+                return new ValidationResult() { Status = ValidationStatus.Failed, Exception = e };
+            }
+            finally
+            {
+                EditorUtility.ClearProgressBar();
+            }
+        }
+
+        private ValidationResult PrepareTemporaryValidationProject(bool interactiveMode)
+        {
+            EditorUtility.DisplayProgressBar("Validating...", "Preparing the validation project. This may take a while.", 0.3f);
+
+            var result = new ValidationResult();
+            var tempProjectPath = Path.Combine(Constants.RootProjectPath, "Temp", GUID.Generate().ToString()).Replace("\\", "/");
+            result.ProjectPath = tempProjectPath;
+
+            if (!Directory.Exists(tempProjectPath))
+                Directory.CreateDirectory(tempProjectPath);
+
+            // Cannot edit a package.json file that does not yet exist - copy over AST instead
+            var tempPackagesPath = $"{tempProjectPath}/Packages";
+            if (!Directory.Exists(tempPackagesPath))
+                Directory.CreateDirectory(tempPackagesPath);
+            var assetStoreToolsPath = PackageUtility.GetAllPackages().FirstOrDefault(x => x.name == "com.unity.asset-store-tools").resolvedPath.Replace("\\", "/");
+            FileUtility.CopyDirectory(assetStoreToolsPath, $"{tempPackagesPath}/com.unity.asset-store-tools", true);
+
+            var logFilePath = $"{tempProjectPath}/preparation.log";
+
+            // Create the temporary project
+            var processInfo = new System.Diagnostics.ProcessStartInfo()
+            {
+                FileName = Constants.UnityPath,
+                Arguments = $"-createProject \"{tempProjectPath}\" -logFile \"{logFilePath}\" -importpackage \"{Path.GetFullPath(_settings.PackagePath)}\" -quit"
+            };
+
+            if (!interactiveMode)
+                processInfo.Arguments += " -batchmode";
+
+            var exitCode = 0;
+
+            using (var process = System.Diagnostics.Process.Start(processInfo))
+            {
+                while (!process.HasExited)
+                {
+                    if (EditorUtility.DisplayCancelableProgressBar("Validating...", "Preparing the validation project. This may take a while.", 0.3f))
+                        process.Kill();
+
+                    Thread.Sleep(10);
+                }
+
+                exitCode = process.ExitCode;
+
+                // Windows and MacOS exit codes
+                if (exitCode == -1 || exitCode == 137)
+                {
+                    result.Status = ValidationStatus.Cancelled;
+                    return result;
+                }
+            }
+
+            if (exitCode != 0)
+            {
+                result.Status = ValidationStatus.Failed;
+                result.Exception = new Exception($"Setting up the temporary project failed (exit code {exitCode})\n\nMore information can be found in the log file: {logFilePath}");
+            }
+            else
+            {
+                result.Status = ValidationStatus.RanToCompletion;
+            }
+
+            return result;
+        }
+
+        private ValidationResult ValidateTemporaryValidationProject(ValidationResult result, bool interactiveMode)
+        {
+            EditorUtility.DisplayProgressBar("Validating...", "Performing validation...", 0.6f);
+
+            var logFilePath = $"{result.ProjectPath}/validation.log";
+            var processInfo = new System.Diagnostics.ProcessStartInfo()
+            {
+                FileName = Constants.UnityPath,
+                Arguments = $"-projectPath \"{result.ProjectPath}\" -logFile \"{logFilePath}\" -executeMethod AssetStoreTools.Validator.ExternalProjectValidator.ValidateProject -category \"{_settings.Category}\""
+            };
+
+            if (!interactiveMode)
+                processInfo.Arguments += " -batchmode -ignorecompilererrors";
+
+            var exitCode = 0;
+
+            using (var process = System.Diagnostics.Process.Start(processInfo))
+            {
+                process.WaitForExit();
+                exitCode = process.ExitCode;
+            }
+
+            if (exitCode != 0)
+            {
+                result.Status = ValidationStatus.Failed;
+                result.Exception = new Exception($"Validating the temporary project failed (exit code {exitCode})\n\nMore information can be found in the log file: {logFilePath}");
+            }
+            else
+            {
+                result.Status = ValidationStatus.RanToCompletion;
+            }
+
+            return result;
+        }
+
+        private ValidationResult ParseValidationResult(string externalProjectPath)
+        {
+            if (!CachingService.GetCachedValidatorStateData(externalProjectPath, out var validationStateData))
+                throw new Exception("Could not find external project's validation results");
+
+            var cachedResult = validationStateData.GetResults();
+            var cachedTestResults = cachedResult.GetResults();
+            var tests = GetApplicableTests(ValidationType.Generic, ValidationType.UnityPackage);
+
+            foreach (var test in tests)
+            {
+                if (!cachedTestResults.Any(x => x.Key == test.Id))
+                    continue;
+
+                var matchingTest = cachedTestResults.First(x => x.Key == test.Id);
+                test.Result = matchingTest.Value;
+            }
+
+            var result = new ValidationResult()
+            {
+                Status = cachedResult.GetStatus(),
+                HadCompilationErrors = cachedResult.GetHadCompilationErrors(),
+                ProjectPath = cachedResult.GetProjectPath(),
+                Tests = tests
+            };
+
+            return result;
+        }
+
+        public static void OpenExternalValidationProject(string projectPath)
+        {
+            var unityPath = Constants.UnityPath;
+            var logFilePath = $"{projectPath}/editor.log";
+
+            var processInfo = new System.Diagnostics.ProcessStartInfo()
+            {
+                FileName = unityPath,
+                Arguments = $"-projectPath \"{projectPath}\" -logFile \"{logFilePath}\" -executeMethod AssetStoreTools.AssetStoreTools.ShowAssetStoreToolsValidator"
+            };
+
+            using (var process = System.Diagnostics.Process.Start(processInfo))
+            {
+                process.WaitForExit();
+            }
+        }
+
+        // Invoked via Command Line Arguments
+        private static void ValidateProject()
+        {
+            var exitCode = 0;
+            try
+            {
+                // Determine whether to validate Assets folder or Packages folders
+                var validationPaths = new List<string>();
+                var packageDirectories = Directory.GetDirectories("Packages", "*", SearchOption.TopDirectoryOnly)
+                    .Select(x => x.Replace("\\", "/"))
+                    .Where(x => x != "Packages/com.unity.asset-store-tools").ToArray();
+
+                if (packageDirectories.Length > 0)
+                    validationPaths.AddRange(packageDirectories);
+                else
+                    validationPaths.Add("Assets");
+
+                // Parse category
+                var category = string.Empty;
+                var args = Environment.GetCommandLineArgs().ToList();
+                var categoryIndex = args.IndexOf("-category");
+                if (categoryIndex != -1 && categoryIndex + 1 < args.Count)
+                    category = args[categoryIndex + 1];
+
+                // Run validation
+                var validationSettings = new CurrentProjectValidationSettings()
+                {
+                    Category = category,
+                    ValidationPaths = validationPaths,
+                    ValidationType = ValidationType.UnityPackage
+                };
+
+                var validator = new CurrentProjectValidator(validationSettings);
+                var result = validator.Validate();
+
+                // Display results
+                AssetStoreTools.ShowAssetStoreToolsValidator(validationSettings, result);
+                EditorUtility.DisplayDialog("Validation complete", "Package validation complete.\n\nTo resume work in the original project, close this Editor instance", "OK");
+            }
+            catch
+            {
+                exitCode = 1;
+                throw;
+            }
+            finally
+            {
+                if (Application.isBatchMode)
+                    EditorApplication.Exit(exitCode);
+            }
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/ExternalProjectValidator.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/ExternalProjectValidator.cs.meta
new file mode 100644
index 0000000..09ea371
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/ExternalProjectValidator.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 2664bbca63a2444498f13beb7e4fa731
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/ExternalProjectValidator.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/IValidator.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/IValidator.cs
new file mode 100644
index 0000000..e6ebee2
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/IValidator.cs
@@ -0,0 +1,11 @@
+using AssetStoreTools.Validator.Data;
+
+namespace AssetStoreTools.Validator
+{
+    internal interface IValidator
+    {
+        ValidationSettings Settings { get; }
+
+        ValidationResult Validate();
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/IValidator.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/IValidator.cs.meta
new file mode 100644
index 0000000..e6d257e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/IValidator.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: d49e9393288e0ed418c546e57c4cb425
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/IValidator.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services.meta
new file mode 100644
index 0000000..03e4234
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9315c4052243ab2488208604c11c53c7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/CachingService.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/CachingService.meta
new file mode 100644
index 0000000..5d9a1cb
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/CachingService.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0a52c1c4a2b7caa458af5b9a212b80a5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/CachingService/CachingService.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/CachingService/CachingService.cs
new file mode 100644
index 0000000..3ee5afa
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/CachingService/CachingService.cs
@@ -0,0 +1,55 @@
+using AssetStoreTools.Utility;
+using AssetStoreTools.Validator.UI.Data.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace AssetStoreTools.Validator.Services
+{
+    internal class CachingService : ICachingService
+    {
+        public bool GetCachedValidatorStateData(out ValidatorStateData stateData)
+        {
+            return GetCachedValidatorStateData(Constants.RootProjectPath, out stateData);
+        }
+
+        public bool GetCachedValidatorStateData(string projectPath, out ValidatorStateData stateData)
+        {
+            stateData = null;
+            if (!CacheUtil.GetFileFromProjectPersistentCache(projectPath, Constants.Cache.ValidationResultFile, out var filePath))
+                return false;
+
+            try
+            {
+                var serializerSettings = new JsonSerializerSettings()
+                {
+                    ContractResolver = ValidatorStateDataContractResolver.Instance,
+                    TypeNameHandling = TypeNameHandling.Auto,
+                    Converters = new List<JsonConverter>() { new StringEnumConverter() }
+                };
+
+                stateData = JsonConvert.DeserializeObject<ValidatorStateData>(File.ReadAllText(filePath, Encoding.UTF8), serializerSettings);
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        public void CacheValidatorStateData(ValidatorStateData stateData)
+        {
+            var serializerSettings = new JsonSerializerSettings()
+            {
+                ContractResolver = ValidatorStateDataContractResolver.Instance,
+                Formatting = Formatting.Indented,
+                TypeNameHandling = TypeNameHandling.Auto,
+                Converters = new List<JsonConverter>() { new StringEnumConverter() }
+            };
+
+            CacheUtil.CreateFileInPersistentCache(Constants.Cache.ValidationResultFile, JsonConvert.SerializeObject(stateData, serializerSettings), true);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/CachingService/CachingService.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/CachingService/CachingService.cs.meta
new file mode 100644
index 0000000..9a7597a
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/CachingService/CachingService.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: b2d545f659acb4343bf485ffb20ecf72
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/CachingService/CachingService.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/CachingService/ICachingService.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/CachingService/ICachingService.cs
new file mode 100644
index 0000000..1ac8e0a
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/CachingService/ICachingService.cs
@@ -0,0 +1,11 @@
+using AssetStoreTools.Validator.UI.Data.Serialization;
+
+namespace AssetStoreTools.Validator.Services
+{
+    internal interface ICachingService : IValidatorService
+    {
+        void CacheValidatorStateData(ValidatorStateData stateData);
+        bool GetCachedValidatorStateData(out ValidatorStateData stateData);
+        bool GetCachedValidatorStateData(string projectPath, out ValidatorStateData stateData);
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/CachingService/ICachingService.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/CachingService/ICachingService.cs.meta
new file mode 100644
index 0000000..6abd7bf
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/CachingService/ICachingService.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: a8a3e36c133848447b043a91e709c63e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/CachingService/ICachingService.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/CachingService/PreviewDatabaseContractResolver.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/CachingService/PreviewDatabaseContractResolver.cs
new file mode 100644
index 0000000..1090401
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/CachingService/PreviewDatabaseContractResolver.cs
@@ -0,0 +1,26 @@
+using Newtonsoft.Json.Serialization;
+
+namespace AssetStoreTools.Previews.Services
+{
+    internal class PreviewDatabaseContractResolver : DefaultContractResolver
+    {
+        private static PreviewDatabaseContractResolver _instance;
+        public static PreviewDatabaseContractResolver Instance => _instance ?? (_instance = new PreviewDatabaseContractResolver());
+
+        private NamingStrategy _namingStrategy;
+
+        private PreviewDatabaseContractResolver()
+        {
+            _namingStrategy = new SnakeCaseNamingStrategy();
+        }
+
+        protected override string ResolvePropertyName(string propertyName)
+        {
+            var resolvedName = _namingStrategy.GetPropertyName(propertyName, false);
+            if (resolvedName.StartsWith("_"))
+                return resolvedName.Substring(1);
+
+            return resolvedName;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/CachingService/PreviewDatabaseContractResolver.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/CachingService/PreviewDatabaseContractResolver.cs.meta
new file mode 100644
index 0000000..e423e2a
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/CachingService/PreviewDatabaseContractResolver.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: aee615e9aaf50fb4f989cd4698e8947e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/CachingService/PreviewDatabaseContractResolver.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/IValidatorService.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/IValidatorService.cs
new file mode 100644
index 0000000..d76eeea
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/IValidatorService.cs
@@ -0,0 +1,4 @@
+namespace AssetStoreTools.Validator.Services
+{
+    internal interface IValidatorService { }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/IValidatorService.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/IValidatorService.cs.meta
new file mode 100644
index 0000000..0623f40
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/IValidatorService.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 075953f4ab4a65d4fae6e891360df0d0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/IValidatorService.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation.meta
new file mode 100644
index 0000000..bf10d70
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 184dcfbfe1d21454fa8cf49f1c637871
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions.meta
new file mode 100644
index 0000000..d6c2cf0
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ed0af5acc22551645ae4cb7d75bd1c36
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IAssetUtilityService.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IAssetUtilityService.cs
new file mode 100644
index 0000000..f2432f6
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IAssetUtilityService.cs
@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace AssetStoreTools.Validator.Services.Validation
+{
+    internal interface IAssetUtilityService : IValidatorService
+    {
+        IEnumerable<string> GetAssetPathsFromAssets(string[] searchPaths, AssetType type);
+        IEnumerable<T> GetObjectsFromAssets<T>(string[] searchPaths, AssetType type) where T : Object;
+        IEnumerable<Object> GetObjectsFromAssets(string[] searchPaths, AssetType type);
+        string ObjectToAssetPath(Object obj);
+        T AssetPathToObject<T>(string assetPath) where T : Object;
+        Object AssetPathToObject(string assetPath);
+        AssetImporter GetAssetImporter(string assetPath);
+        AssetImporter GetAssetImporter(Object asset);
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IAssetUtilityService.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IAssetUtilityService.cs.meta
new file mode 100644
index 0000000..85142f3
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IAssetUtilityService.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: d28c5ea40f4c9954bae02804e416b898
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IAssetUtilityService.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IFileSignatureUtilityService.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IFileSignatureUtilityService.cs
new file mode 100644
index 0000000..86d5d6e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IFileSignatureUtilityService.cs
@@ -0,0 +1,7 @@
+namespace AssetStoreTools.Validator.Services.Validation
+{
+    internal interface IFileSignatureUtilityService : IValidatorService
+    {
+        ArchiveType GetArchiveType(string filePath);
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IFileSignatureUtilityService.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IFileSignatureUtilityService.cs.meta
new file mode 100644
index 0000000..9b6cbb8
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IFileSignatureUtilityService.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 609c423482ecf8844a71166b4ef49cb6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IFileSignatureUtilityService.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IMeshUtilityService.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IMeshUtilityService.cs
new file mode 100644
index 0000000..2f16830
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IMeshUtilityService.cs
@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace AssetStoreTools.Validator.Services.Validation
+{
+    internal interface IMeshUtilityService : IValidatorService
+    {
+        IEnumerable<Mesh> GetCustomMeshesInObject(GameObject obj);
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IMeshUtilityService.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IMeshUtilityService.cs.meta
new file mode 100644
index 0000000..28ce709
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IMeshUtilityService.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: acde6f9b97c9cac4b88a84aa9001a0fc
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IMeshUtilityService.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IModelUtilityService.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IModelUtilityService.cs
new file mode 100644
index 0000000..ed47ec4
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IModelUtilityService.cs
@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace AssetStoreTools.Validator.Services.Validation
+{
+    internal interface IModelUtilityService : IValidatorService
+    {
+        Dictionary<Object, List<LogEntry>> GetImportLogs(params Object[] models);
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IModelUtilityService.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IModelUtilityService.cs.meta
new file mode 100644
index 0000000..e710e85
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IModelUtilityService.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 91f6bacccdfecb84fb5ab0ba384353b4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IModelUtilityService.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/ISceneUtilityService.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/ISceneUtilityService.cs
new file mode 100644
index 0000000..d6d38f5
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/ISceneUtilityService.cs
@@ -0,0 +1,13 @@
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+namespace AssetStoreTools.Validator.Services.Validation
+{
+    internal interface ISceneUtilityService : IValidatorService
+    {
+        string CurrentScenePath { get; }
+
+        Scene OpenScene(string scenePath);
+        GameObject[] GetRootGameObjects();
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/ISceneUtilityService.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/ISceneUtilityService.cs.meta
new file mode 100644
index 0000000..ac0e61d
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/ISceneUtilityService.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: cf5ef331063e5aa4e95dfe3eadedf9af
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/ISceneUtilityService.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IScriptUtilityService.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IScriptUtilityService.cs
new file mode 100644
index 0000000..e442aa0
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IScriptUtilityService.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using UnityEditor;
+using Object = UnityEngine.Object;
+
+namespace AssetStoreTools.Validator.Services.Validation
+{
+    internal interface IScriptUtilityService : IValidatorService
+    {
+        IReadOnlyDictionary<MonoScript, IList<(string Name, string Namespace)>> GetTypeNamespacesFromScriptAssets(IList<MonoScript> monoScripts);
+        IReadOnlyDictionary<Object, IList<Type>> GetTypesFromAssemblies(IList<Object> assemblies);
+        IReadOnlyDictionary<MonoScript, IList<Type>> GetTypesFromScriptAssets(IList<MonoScript> monoScripts);
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IScriptUtilityService.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IScriptUtilityService.cs.meta
new file mode 100644
index 0000000..cf09904
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IScriptUtilityService.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: e0a9f88d37222e4428853b6d3d00b1bd
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Abstractions/IScriptUtilityService.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/AssetUtilityService.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/AssetUtilityService.cs
new file mode 100644
index 0000000..bacedaf
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/AssetUtilityService.cs
@@ -0,0 +1,216 @@
+using AssetStoreTools.Utility;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using UnityEditor;
+using UnityEditor.Compilation;
+using UnityEngine;
+using Object = UnityEngine.Object;
+
+namespace AssetStoreTools.Validator.Services.Validation
+{
+    internal class AssetUtilityService : IAssetUtilityService
+    {
+        public IEnumerable<string> GetAssetPathsFromAssets(string[] searchPaths, AssetType type)
+        {
+            string filter = string.Empty;
+            string[] extensions = null;
+
+            switch (type)
+            {
+                // General Types
+                case AssetType.All:
+                    filter = "";
+                    break;
+                case AssetType.Prefab:
+                    filter = "t:prefab";
+                    break;
+                case AssetType.Material:
+                    filter = "t:material";
+                    break;
+                case AssetType.Model:
+                    filter = "t:model";
+                    break;
+                case AssetType.Scene:
+                    filter = "t:scene";
+                    break;
+                case AssetType.Texture:
+                    filter = "t:texture";
+                    break;
+                case AssetType.Video:
+                    filter = "t:VideoClip";
+                    break;
+                // Specific Types
+                case AssetType.LossyAudio:
+                    filter = "t:AudioClip";
+                    extensions = new[] { ".mp3", ".ogg" };
+                    break;
+                case AssetType.NonLossyAudio:
+                    filter = "t:AudioClip";
+                    extensions = new[] { ".wav", ".aif", ".aiff" };
+                    break;
+                case AssetType.JavaScript:
+                    filter = "t:TextAsset";
+                    extensions = new[] { ".js" };
+                    break;
+                case AssetType.Mixamo:
+                    filter = "t:model";
+                    extensions = new[] { ".fbx" };
+                    break;
+                case AssetType.JPG:
+                    filter = "t:texture";
+                    extensions = new[] { ".jpg", "jpeg" };
+                    break;
+                case AssetType.Executable:
+                    filter = string.Empty;
+                    extensions = new[] { ".exe", ".bat", ".msi", ".apk" };
+                    break;
+                case AssetType.Documentation:
+                    filter = string.Empty;
+                    extensions = new[] { ".txt", ".pdf", ".html", ".rtf", ".md" };
+                    break;
+                case AssetType.SpeedTree:
+                    filter = string.Empty;
+                    extensions = new[] { ".spm", ".srt", ".stm", ".scs", ".sfc", ".sme", ".st" };
+                    break;
+                case AssetType.Shader:
+                    filter = string.Empty;
+                    extensions = new[] { ".shader", ".shadergraph", ".raytrace", ".compute" };
+                    break;
+                case AssetType.MonoScript:
+                    filter = "t:script";
+                    extensions = new[] { ".cs" };
+                    break;
+                case AssetType.UnityPackage:
+                    filter = string.Empty;
+                    extensions = new[] { ".unitypackage" };
+                    break;
+                case AssetType.PrecompiledAssembly:
+                    var assemblyPaths = GetPrecompiledAssemblies(searchPaths);
+                    return assemblyPaths;
+                default:
+                    return Array.Empty<string>();
+            }
+
+            var guids = AssetDatabase.FindAssets(filter, searchPaths);
+            var paths = guids.Select(AssetDatabase.GUIDToAssetPath);
+
+            if (extensions != null)
+                paths = paths.Where(x => extensions.Any(x.ToLower().EndsWith));
+
+            if (type == AssetType.Mixamo)
+                paths = paths.Where(IsMixamoFbx);
+
+            paths = paths.Distinct();
+            return paths;
+        }
+
+        public IEnumerable<T> GetObjectsFromAssets<T>(string[] searchPaths, AssetType type) where T : Object
+        {
+            var paths = GetAssetPathsFromAssets(searchPaths, type);
+#if !AB_BUILDER
+            var objects = paths.Select(AssetDatabase.LoadAssetAtPath<T>).Where(x => x != null);
+#else
+            var objects = new AssetEnumerator<T>(paths);
+#endif
+            return objects;
+        }
+
+        public IEnumerable<Object> GetObjectsFromAssets(string[] searchPaths, AssetType type)
+        {
+            return GetObjectsFromAssets<Object>(searchPaths, type);
+        }
+
+        private IEnumerable<string> GetPrecompiledAssemblies(string[] searchPaths)
+        {
+            // Note - for packages, Compilation Pipeline returns full paths, as they appear on disk, not Asset Database
+            var allDllPaths = CompilationPipeline.GetPrecompiledAssemblyPaths(CompilationPipeline.PrecompiledAssemblySources.UserAssembly);
+            var rootProjectPath = Application.dataPath.Substring(0, Application.dataPath.Length - "Assets".Length);
+            var packages = PackageUtility.GetAllLocalPackages();
+
+            var result = new List<string>();
+            foreach (var dllPath in allDllPaths)
+            {
+                var absoluteDllPath = Path.GetFullPath(dllPath).Replace("\\", "/");
+                foreach (var validationPath in searchPaths)
+                {
+                    var absoluteValidationPath = Path.GetFullPath(validationPath).Replace("\\", "/");
+                    if (absoluteDllPath.StartsWith(absoluteValidationPath))
+                    {
+                        int pathSeparatorLength = 1;
+                        if (absoluteDllPath.StartsWith(Application.dataPath))
+                        {
+                            var adbPath = $"Assets/{absoluteDllPath.Remove(0, Application.dataPath.Length + pathSeparatorLength)}";
+                            result.Add(adbPath);
+                        }
+                        else
+                        {
+                            // For non-Asset folder paths (i.e. local and embedded packages), convert disk path to ADB path
+                            var package = packages.FirstOrDefault(x => dllPath.StartsWith(x.resolvedPath.Replace('\\', '/')));
+
+                            if (package == null)
+                                continue;
+
+                            var dllPathInPackage = absoluteDllPath.Remove(0, Path.GetFullPath(package.resolvedPath).Length + pathSeparatorLength);
+                            var adbPath = $"Packages/{package.name}/{dllPathInPackage}";
+
+                            result.Add(adbPath);
+                        }
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        private bool IsMixamoFbx(string fbxPath)
+        {
+            // Location of Mixamo Header, this is located in every mixamo fbx file exported
+            //const int mixamoHeader = 0x4c0 + 2; // < this is the original location from A$ Tools, unsure if Mixamo file headers were changed since then
+            const int mixamoHeader = 1622;
+            // Length of Mixamo header
+            const int length = 0xa;
+
+            var fs = new FileStream(fbxPath, FileMode.Open);
+            // Check if length is further than
+            if (fs.Length < mixamoHeader)
+                return false;
+
+            byte[] buffer = new byte[length];
+            using (BinaryReader reader = new BinaryReader(fs))
+            {
+                reader.BaseStream.Seek(mixamoHeader, SeekOrigin.Begin);
+                reader.Read(buffer, 0, length);
+            }
+
+            string result = System.Text.Encoding.ASCII.GetString(buffer);
+            return result.Contains("Mixamo");
+        }
+
+        public string ObjectToAssetPath(Object obj)
+        {
+            return AssetDatabase.GetAssetPath(obj);
+        }
+
+        public T AssetPathToObject<T>(string assetPath) where T : Object
+        {
+            return AssetDatabase.LoadAssetAtPath<T>(assetPath);
+        }
+
+        public Object AssetPathToObject(string assetPath)
+        {
+            return AssetPathToObject<Object>(assetPath);
+        }
+
+        public AssetImporter GetAssetImporter(string assetPath)
+        {
+            return AssetImporter.GetAtPath(assetPath);
+        }
+
+        public AssetImporter GetAssetImporter(Object asset)
+        {
+            return GetAssetImporter(ObjectToAssetPath(asset));
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/AssetUtilityService.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/AssetUtilityService.cs.meta
new file mode 100644
index 0000000..f28cb1c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/AssetUtilityService.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 9634968648d355c47b7cb12aead7abab
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/AssetUtilityService.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Data.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Data.meta
new file mode 100644
index 0000000..3256935
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Data.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8dcc2f4da0b6cea4ab4733ebf32edab4
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Data/ArchiveType.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Data/ArchiveType.cs
new file mode 100644
index 0000000..b2bddd0
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Data/ArchiveType.cs
@@ -0,0 +1,19 @@
+namespace AssetStoreTools.Validator.Services.Validation
+{
+    internal enum ArchiveType
+    {
+        None,
+        TarGz,
+        Zip,
+        Rar,
+        Tar,
+        TarZip,
+        Bz2,
+        LZip,
+        SevenZip,
+        GZip,
+        QuickZip,
+        Xz,
+        Wim
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Data/ArchiveType.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Data/ArchiveType.cs.meta
new file mode 100644
index 0000000..dcf4f0c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Data/ArchiveType.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 4061cb7aed3883346a66494c23e2e77b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Data/ArchiveType.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Data/AssetEnumerator.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Data/AssetEnumerator.cs
new file mode 100644
index 0000000..cc89350
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Data/AssetEnumerator.cs
@@ -0,0 +1,84 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using Object = UnityEngine.Object;
+
+namespace AssetStoreTools.Validator.Services.Validation
+{
+    internal class AssetEnumerator<T> : IEnumerator<T>, IEnumerable<T> where T : Object
+    {
+        public const int Capacity = 32;
+
+        private Queue<string> _pathQueue;
+        private Queue<T> _loadedAssetQueue;
+
+        private T _currentElement;
+
+        public AssetEnumerator(IEnumerable<string> paths)
+        {
+            _pathQueue = new Queue<string>(paths);
+            _loadedAssetQueue = new Queue<T>();
+        }
+
+        public bool MoveNext()
+        {
+            bool hasPathsButHasNoAssets = _pathQueue.Count != 0 && _loadedAssetQueue.Count == 0;
+            if (hasPathsButHasNoAssets)
+            {
+                LoadMore();
+            }
+
+            bool dequeued = false;
+            if (_loadedAssetQueue.Count != 0)
+            {
+                _currentElement = _loadedAssetQueue.Dequeue();
+                dequeued = true;
+            }
+
+            return dequeued;
+        }
+
+        private void LoadMore()
+        {
+            int limit = Capacity;
+            while (limit > 0 && _pathQueue.Count != 0)
+            {
+                string path = _pathQueue.Dequeue();
+                T asset = AssetDatabase.LoadAssetAtPath<T>(path);
+                if (asset != null)
+                {
+                    _loadedAssetQueue.Enqueue(asset);
+                    limit--;
+                }
+            }
+
+            // Unload other loose asset references
+            EditorUtility.UnloadUnusedAssetsImmediate();
+        }
+
+        public void Reset()
+        {
+            throw new NotSupportedException("Asset Enumerator cannot be reset.");
+        }
+
+        public T Current => _currentElement;
+
+        object IEnumerator.Current => Current;
+
+        public void Dispose()
+        {
+            // No need to dispose
+        }
+
+        IEnumerator<T> IEnumerable<T>.GetEnumerator()
+        {
+            return this;
+        }
+
+        public IEnumerator GetEnumerator()
+        {
+            return this;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Data/AssetEnumerator.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Data/AssetEnumerator.cs.meta
new file mode 100644
index 0000000..01ead66
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Data/AssetEnumerator.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 0859579889cc56f4aa26eb863a1487b9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Data/AssetEnumerator.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Data/AssetType.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Data/AssetType.cs
new file mode 100644
index 0000000..acd7491
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Data/AssetType.cs
@@ -0,0 +1,25 @@
+namespace AssetStoreTools.Validator.Services.Validation
+{
+    internal enum AssetType
+    {
+        All,
+        Documentation,
+        Executable,
+        JPG,
+        JavaScript,
+        LossyAudio,
+        Material,
+        Mixamo,
+        Model,
+        MonoScript,
+        NonLossyAudio,
+        PrecompiledAssembly,
+        Prefab,
+        Scene,
+        Shader,
+        SpeedTree,
+        Texture,
+        UnityPackage,
+        Video
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Data/AssetType.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Data/AssetType.cs.meta
new file mode 100644
index 0000000..5519b78
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Data/AssetType.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: b81d00d4ed0a7da4289d4d6248ef9d34
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Data/AssetType.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Data/LogEntry.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Data/LogEntry.cs
new file mode 100644
index 0000000..6fe2355
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Data/LogEntry.cs
@@ -0,0 +1,10 @@
+using UnityEngine;
+
+namespace AssetStoreTools.Validator.Services.Validation
+{
+    internal class LogEntry
+    {
+        public string Message;
+        public LogType Severity;
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Data/LogEntry.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Data/LogEntry.cs.meta
new file mode 100644
index 0000000..e4d2006
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Data/LogEntry.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: a1e81104d6b0f4c449ee57503c3b6669
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/Data/LogEntry.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/FileSignatureUtilityService.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/FileSignatureUtilityService.cs
new file mode 100644
index 0000000..1831887
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/FileSignatureUtilityService.cs
@@ -0,0 +1,78 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using UnityEngine;
+
+namespace AssetStoreTools.Validator.Services.Validation
+{
+    internal class FileSignatureUtilityService : IFileSignatureUtilityService
+    {
+        private class FileSignature
+        {
+            public byte[] SignatureBytes;
+            public int Offset;
+
+            public FileSignature(byte[] signatureBytes, int offset)
+            {
+                SignatureBytes = signatureBytes;
+                Offset = offset;
+            }
+        }
+
+        private static readonly Dictionary<FileSignature, ArchiveType> ArchiveSignatures = new Dictionary<FileSignature, ArchiveType>
+        {
+            { new FileSignature(new byte[] { 0x1f, 0x8b }, 0), ArchiveType.TarGz },
+            { new FileSignature(new byte[] { 0x50, 0x4b, 0x03, 0x04 }, 0), ArchiveType.Zip },
+            { new FileSignature(new byte[] { 0x50, 0x4b, 0x05, 0x06 }, 0), ArchiveType.Zip }, // Empty Zip Archive
+            { new FileSignature(new byte[] { 0x50, 0x4b, 0x07, 0x08 }, 0), ArchiveType.Zip }, // Spanned Zip Archive
+
+            { new FileSignature(new byte[] { 0x52, 0x61, 0x72, 0x21, 0x1a, 0x07, 0x00 }, 0), ArchiveType.Rar }, // RaR v1.50+
+            { new FileSignature(new byte[] { 0x52, 0x61, 0x72, 0x21, 0x1a, 0x07, 0x01, 0x00 }, 0), ArchiveType.Rar }, // RaR v5.00+
+            { new FileSignature(new byte[] { 0x75, 0x73, 0x74, 0x61, 0x72, 0x00, 0x30, 0x30 }, 257), ArchiveType.Tar },
+            { new FileSignature(new byte[] { 0x75, 0x73, 0x74, 0x61, 0x72, 0x20, 0x20, 0x00 }, 257), ArchiveType.Tar },
+            { new FileSignature(new byte[] { 0x1f, 0x9d }, 0), ArchiveType.TarZip }, // TarZip LZW algorithm
+            { new FileSignature(new byte[] { 0x1f, 0xa0 }, 0), ArchiveType.TarZip }, // TarZip LZH algorithm
+            { new FileSignature(new byte[] { 0x42, 0x5a, 0x68 }, 0), ArchiveType.Bz2 },
+            { new FileSignature(new byte[] { 0x4c, 0x5a, 0x49, 0x50 }, 0), ArchiveType.LZip },
+            { new FileSignature(new byte[] { 0x37, 0x7a, 0xbc, 0xaf, 0x27, 0x1c }, 0), ArchiveType.SevenZip },
+            { new FileSignature(new byte[] { 0x1f, 0x8b }, 0), ArchiveType.GZip },
+            { new FileSignature(new byte[] { 0x52, 0x53, 0x56, 0x4b, 0x44, 0x41, 0x54, 0x41 }, 0), ArchiveType.QuickZip },
+            { new FileSignature(new byte[] { 0xfd, 0x37, 0x7a, 0x58, 0x5a, 0x00 }, 0), ArchiveType.Xz },
+            { new FileSignature(new byte[] { 0x4D, 0x53, 0x57, 0x49, 0x4D, 0x00, 0x00, 0x00, 0xD0, 0x00, 0x00, 0x00, 0x00 }, 0), ArchiveType.Wim }
+        };
+
+        public ArchiveType GetArchiveType(string filePath)
+        {
+            if (!File.Exists(filePath))
+                return ArchiveType.None;
+
+            try
+            {
+                using (FileStream stream = new FileStream(filePath, FileMode.Open, FileAccess.Read))
+                {
+                    foreach (var kvp in ArchiveSignatures)
+                    {
+                        var fileSignature = kvp.Key;
+                        var archiveType = kvp.Value;
+
+                        if (stream.Length < fileSignature.SignatureBytes.Length)
+                            continue;
+
+                        var bytes = new byte[fileSignature.SignatureBytes.Length];
+                        stream.Seek(fileSignature.Offset, SeekOrigin.Begin);
+                        stream.Read(bytes, 0, bytes.Length);
+
+                        if (fileSignature.SignatureBytes.SequenceEqual(bytes.Take(fileSignature.SignatureBytes.Length)))
+                            return archiveType;
+                    }
+                }
+            }
+            catch (DirectoryNotFoundException)
+            {
+                Debug.LogWarning($"File '{filePath}' exists, but could not be opened for reading. Please make sure the project path lengths are not too long for the Operating System");
+            }
+
+            return ArchiveType.None;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/FileSignatureUtilityService.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/FileSignatureUtilityService.cs.meta
new file mode 100644
index 0000000..744f983
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/FileSignatureUtilityService.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 695ed79ad88c3b44b8ae41b650ebe16c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/FileSignatureUtilityService.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/MeshUtilityService.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/MeshUtilityService.cs
new file mode 100644
index 0000000..9c2d322
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/MeshUtilityService.cs
@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+
+namespace AssetStoreTools.Validator.Services.Validation
+{
+    internal class MeshUtilityService : IMeshUtilityService
+    {
+        public IEnumerable<Mesh> GetCustomMeshesInObject(GameObject obj)
+        {
+            var meshes = new List<Mesh>();
+
+            var meshFilters = obj.GetComponentsInChildren<MeshFilter>(true);
+            var skinnedMeshes = obj.GetComponentsInChildren<SkinnedMeshRenderer>(true);
+
+            meshes.AddRange(meshFilters.Select(m => m.sharedMesh));
+            meshes.AddRange(skinnedMeshes.Select(m => m.sharedMesh));
+
+            meshes = meshes.Where(m => AssetDatabase.GetAssetPath(m).StartsWith("Assets/") ||
+            AssetDatabase.GetAssetPath(m).StartsWith("Packages/")).ToList();
+
+            return meshes;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/MeshUtilityService.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/MeshUtilityService.cs.meta
new file mode 100644
index 0000000..5f40471
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/MeshUtilityService.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 307f5dd7be983e246adbda52ac50ecf3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/MeshUtilityService.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/ModelUtilityService.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/ModelUtilityService.cs
new file mode 100644
index 0000000..8ef7781
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/ModelUtilityService.cs
@@ -0,0 +1,147 @@
+#if !UNITY_2022_2_OR_NEWER
+using System;
+using System.Reflection;
+#endif
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor;
+#if UNITY_2022_2_OR_NEWER
+using UnityEditor.AssetImporters;
+#endif
+using UnityEngine;
+using Object = UnityEngine.Object;
+
+namespace AssetStoreTools.Validator.Services.Validation
+{
+    internal class ModelUtilityService : IModelUtilityService
+    {
+        private IAssetUtilityService _assetUtility;
+
+#if !UNITY_2022_2_OR_NEWER
+        // Rig fields
+        private const string RigImportWarningsField = "m_RigImportWarnings";
+        private const string RigImportErrorsField = "m_RigImportErrors";
+
+        // Animation fields
+        private const string AnimationImportWarningsField = "m_AnimationImportWarnings";
+        private const string AnimationImportErrorsField = "m_AnimationImportErrors";
+
+        private static Editor _modelImporterEditor = null;
+#endif
+
+        public ModelUtilityService(IAssetUtilityService assetUtility)
+        {
+            _assetUtility = assetUtility;
+        }
+
+        public Dictionary<Object, List<LogEntry>> GetImportLogs(params Object[] models)
+        {
+#if UNITY_2022_2_OR_NEWER
+            return GetImportLogsDefault(models);
+#else
+            return GetImportLogsLegacy(models);
+#endif
+        }
+
+#if UNITY_2022_2_OR_NEWER
+        private Dictionary<Object, List<LogEntry>> GetImportLogsDefault(params Object[] models)
+        {
+            var modelsWithLogs = new Dictionary<Object, List<LogEntry>>();
+
+            foreach (var model in models)
+            {
+                var modelLogs = new List<LogEntry>();
+
+                var importLog = AssetImporter.GetImportLog(_assetUtility.ObjectToAssetPath(model));
+
+                if (importLog == null)
+                    continue;
+
+                var entries = importLog.logEntries.Where(x => x.flags.HasFlag(ImportLogFlags.Warning) || x.flags.HasFlag(ImportLogFlags.Error));
+                foreach (var entry in entries)
+                {
+                    var severity = entry.flags.HasFlag(ImportLogFlags.Error) ? LogType.Error : LogType.Warning;
+                    modelLogs.Add(new LogEntry() { Message = entry.message, Severity = severity });
+                }
+
+                if (modelLogs.Count > 0)
+                    modelsWithLogs.Add(model, modelLogs);
+            }
+
+            return modelsWithLogs;
+        }
+#endif
+
+#if !UNITY_2022_2_OR_NEWER
+        private Dictionary<Object, List<LogEntry>> GetImportLogsLegacy(params Object[] models)
+        {
+            var modelsWithLogs = new Dictionary<Object, List<LogEntry>>();
+
+            foreach (var model in models)
+            {
+                var modelLogs = new List<LogEntry>();
+
+                // Load the Model Importer
+                var modelImporter = _assetUtility.GetAssetImporter(model) as ModelImporter;
+
+                var editorAssembly = AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(x => x.GetName().Name.Equals("UnityEditor"));
+
+                var modelImporterEditorType = editorAssembly.GetType("UnityEditor.ModelImporterEditor");
+
+                // Load its Model Importer Editor
+                Editor.CreateCachedEditorWithContext(new Object[] { modelImporter }, model, modelImporterEditorType, ref _modelImporterEditor);
+
+                // Find the base type
+                var modelImporterEditorTypeBase = _modelImporterEditor.GetType().BaseType;
+
+                // Get the tabs value
+                var tabsArrayType = modelImporterEditorTypeBase.GetRuntimeProperties().FirstOrDefault(x => x.Name == "tabs");
+                var tabsArray = (Array)tabsArrayType.GetValue(_modelImporterEditor);
+
+                // Get the tabs (Model | Rig | Animation | Materials)
+                var rigTab = tabsArray.GetValue(1);
+                var animationTab = tabsArray.GetValue(2);
+
+                var rigErrorsCheckSuccess = CheckFieldForSerializedProperty(rigTab, RigImportErrorsField, out var rigErrors);
+                var rigWarningsCheckSuccess = CheckFieldForSerializedProperty(rigTab, RigImportWarningsField, out var rigWarnings);
+                var animationErrorsCheckSuccess = CheckFieldForSerializedProperty(animationTab, AnimationImportErrorsField, out var animationErrors);
+                var animationWarningsCheckSuccess = CheckFieldForSerializedProperty(animationTab, AnimationImportWarningsField, out var animationWarnings);
+
+                if (!rigErrorsCheckSuccess || !rigWarningsCheckSuccess || !animationErrorsCheckSuccess || !animationWarningsCheckSuccess)
+                    UnityEngine.Debug.LogWarning($"An error was encountered when checking import logs for model '{model.name}'");
+
+                if (!string.IsNullOrEmpty(rigWarnings))
+                    modelLogs.Add(new LogEntry() { Message = rigWarnings, Severity = LogType.Warning });
+                if (!string.IsNullOrEmpty(rigErrors))
+                    modelLogs.Add(new LogEntry() { Message = rigErrors, Severity = LogType.Error });
+                if (!string.IsNullOrEmpty(animationWarnings))
+                    modelLogs.Add(new LogEntry() { Message = animationWarnings, Severity = LogType.Warning });
+                if (!string.IsNullOrEmpty(animationErrors))
+                    modelLogs.Add(new LogEntry() { Message = animationErrors, Severity = LogType.Error });
+
+                if (modelLogs.Count > 0)
+                    modelsWithLogs.Add(model, modelLogs);
+            }
+
+            return modelsWithLogs;
+        }
+
+        private static bool CheckFieldForSerializedProperty(object source, string propertyName, out string message)
+        {
+            message = string.Empty;
+
+            try
+            {
+                var propertyType = source.GetType().GetRuntimeFields().FirstOrDefault(x => x.Name.Equals(propertyName, StringComparison.OrdinalIgnoreCase));
+                var propertyValue = propertyType.GetValue(source) as SerializedProperty;
+                message = propertyValue.stringValue;
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+#endif
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/ModelUtilityService.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/ModelUtilityService.cs.meta
new file mode 100644
index 0000000..2db4520
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/ModelUtilityService.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: c50ca4c87e66f1b478279e5d1db4a08e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/ModelUtilityService.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/SceneUtilityService.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/SceneUtilityService.cs
new file mode 100644
index 0000000..0402f9e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/SceneUtilityService.cs
@@ -0,0 +1,26 @@
+using UnityEditor;
+using UnityEditor.SceneManagement;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+namespace AssetStoreTools.Validator.Services.Validation
+{
+    internal class SceneUtilityService : ISceneUtilityService
+    {
+        public string CurrentScenePath => SceneManager.GetActiveScene().path;
+
+        public Scene OpenScene(string scenePath)
+        {
+            EditorSceneManager.SaveCurrentModifiedScenesIfUserWantsTo();
+            if (string.IsNullOrEmpty(scenePath) || AssetDatabase.LoadAssetAtPath<SceneAsset>(scenePath) == null)
+                return EditorSceneManager.NewScene(NewSceneSetup.DefaultGameObjects);
+            else
+                return EditorSceneManager.OpenScene(scenePath);
+        }
+
+        public GameObject[] GetRootGameObjects()
+        {
+            return SceneManager.GetSceneByPath(CurrentScenePath).GetRootGameObjects();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/SceneUtilityService.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/SceneUtilityService.cs.meta
new file mode 100644
index 0000000..e88be26
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/SceneUtilityService.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 53e8deb0ebfb7ea47956f3a859580cd4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/SceneUtilityService.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/ScriptUtilityService.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/ScriptUtilityService.cs
new file mode 100644
index 0000000..5812994
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/ScriptUtilityService.cs
@@ -0,0 +1,658 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
+using UnityEditor;
+using Object = UnityEngine.Object;
+
+namespace AssetStoreTools.Validator.Services.Validation
+{
+    internal class ScriptUtilityService : IScriptUtilityService
+    {
+        private const int ScriptTimeoutMs = 10000;
+        private const string IgnoredAssemblyCharacters = "!@#$%^*&()-+=[]{}\\|;:'\",.<>/?";
+
+        /// <summary>
+        /// For a given list of script assets, retrieves a list of types and their namespaces
+        /// </summary>
+        /// <param name="monoScripts"></param>
+        /// <returns>A dictionary mapping each script asset with a list of its types.
+        /// The type tuple contains a name (e.g. <i>class MyClass</i>) and its namespace (e.g. <i>MyNamespace</i>)
+        /// </returns>
+        public IReadOnlyDictionary<MonoScript, IList<(string Name, string Namespace)>> GetTypeNamespacesFromScriptAssets(IList<MonoScript> monoScripts)
+        {
+            var typesAndNamespaces = new Dictionary<MonoScript, IList<(string Name, string Namespace)>>();
+            var typeInfos = GetTypeInfosFromScriptAssets(monoScripts);
+
+            foreach (var kvp in typeInfos)
+            {
+                var namespacesInScript = new List<(string Name, string Namespace)>();
+                foreach (var typeInfo in kvp.Value)
+                {
+                    bool isValidType = typeInfo.TypeName == ScriptParser.TypeName.Class || typeInfo.TypeName == ScriptParser.TypeName.Struct ||
+                        typeInfo.TypeName == ScriptParser.TypeName.Interface || typeInfo.TypeName == ScriptParser.TypeName.Enum;
+
+                    if (isValidType)
+                        namespacesInScript.Add(($"{typeInfo.TypeName.ToString().ToLower()} {typeInfo.Name}", typeInfo.Namespace));
+                }
+
+                typesAndNamespaces.Add(kvp.Key, namespacesInScript);
+            }
+
+            return typesAndNamespaces;
+        }
+
+        /// <summary>
+        /// Scans the given precompiled assembly assets to retrieve a list of their contained types
+        /// </summary>
+        /// <param name="assemblies"></param>
+        /// <returns>A dictionary mapping each precompiled assembly asset with a list of <see cref="Type"> System.Type </see> objects.</returns>
+        public IReadOnlyDictionary<Object, IList<Type>> GetTypesFromAssemblies(IList<Object> assemblies)
+        {
+            var dllPaths = assemblies.ToDictionary(t => AssetDatabase.GetAssetPath(t), t => t);
+            var types = new ConcurrentDictionary<Object, IList<Type>>();
+            var failedDllPaths = new ConcurrentBag<string>();
+
+            var allAssemblies = AppDomain.CurrentDomain.GetAssemblies();
+
+            Parallel.ForEach(dllPaths.Keys,
+                (assemblyPath) =>
+                {
+                    try
+                    {
+                        var assembly = allAssemblies.FirstOrDefault(x => Path.GetFullPath(x.Location).Equals(Path.GetFullPath(assemblyPath), StringComparison.OrdinalIgnoreCase));
+                        if (assembly == null)
+                            return;
+
+                        var assemblyTypes = assembly.GetTypes().Where(x => !IgnoredAssemblyCharacters.Any(c => x.Name.Contains(c))).ToList();
+                        types.TryAdd(dllPaths[assemblyPath], assemblyTypes);
+                    }
+                    catch
+                    {
+                        failedDllPaths.Add(assemblyPath);
+                    }
+                });
+
+            if (failedDllPaths.Count > 0)
+            {
+                var message = new StringBuilder("The following precompiled assemblies could not be checked:");
+                foreach (var path in failedDllPaths)
+                    message.Append($"\n{path}");
+                UnityEngine.Debug.LogWarning(message);
+            }
+
+            // Types are sorted randomly due to parallelism, therefore need to be sorted before returning
+            var sortedTypes = dllPaths.Where(x => types.ContainsKey(x.Value))
+                .Select(x => new KeyValuePair<Object, IList<Type>>(x.Value, types[x.Value]))
+                .ToDictionary(t => t.Key, t => t.Value);
+
+            return sortedTypes;
+        }
+
+        /// <summary>
+        /// Scans the given script assets to retrieve a list of their contained types
+        /// </summary>
+        /// <param name="monoScripts"></param>
+        /// <returns>A dictionary mapping each precompiled assembly asset with a list of <see cref="Type"> System.Type </see> objects.</returns>
+        public IReadOnlyDictionary<MonoScript, IList<Type>> GetTypesFromScriptAssets(IList<MonoScript> monoScripts)
+        {
+            var realTypes = new Dictionary<MonoScript, IList<Type>>();
+            var typeInfos = GetTypeInfosFromScriptAssets(monoScripts);
+            var assemblies = AppDomain.CurrentDomain.GetAssemblies();
+
+            foreach (var kvp in typeInfos)
+            {
+                var realTypesInScript = new List<Type>();
+                foreach (var typeInfo in kvp.Value)
+                {
+                    bool isValidType = typeInfo.TypeName == ScriptParser.TypeName.Class || typeInfo.TypeName == ScriptParser.TypeName.Struct ||
+                        typeInfo.TypeName == ScriptParser.TypeName.Interface || typeInfo.TypeName == ScriptParser.TypeName.Enum;
+
+                    if (isValidType)
+                    {
+                        var realType = assemblies.Where(a => a.GetType(typeInfo.GetReflectionFriendlyFullName()) != null)
+                            .Select(a => a.GetType(typeInfo.GetReflectionFriendlyFullName())).FirstOrDefault();
+                        if (realType != null)
+                            realTypesInScript.Add(realType);
+                    }
+                }
+
+                realTypes.Add(kvp.Key, realTypesInScript);
+            }
+
+            return realTypes;
+        }
+
+        /// <summary>
+        /// Scans the given MonoScript assets to retrieve a list of their contained types
+        /// </summary>
+        /// <param name="monoScripts"></param>
+        /// <returns>A dictionary mapping each script asset with a list of <see cref="TypeInfo"> TypeInfo </see> objects. </returns>
+        private IReadOnlyDictionary<MonoScript, IList<ScriptParser.BlockInfo>> GetTypeInfosFromScriptAssets(IList<MonoScript> monoScripts)
+        {
+            var types = new ConcurrentDictionary<MonoScript, IList<ScriptParser.BlockInfo>>();
+            var monoScriptContents = new Dictionary<MonoScript, string>();
+            var failedScripts = new ConcurrentBag<MonoScript>();
+
+            // A separate dictionary is needed because MonoScript contents cannot be accessed outside of the main thread
+            foreach (var kvp in monoScripts)
+                monoScriptContents.Add(kvp, kvp.text);
+
+            var tasks = new List<Tuple<Task, CancellationTokenSource>>();
+
+            try
+            {
+                foreach (var kvp in monoScriptContents)
+                {
+                    var cancellationTokenSource = new CancellationTokenSource(ScriptTimeoutMs);
+
+                    var task = Task.Run(() =>
+                    {
+                        var parsingTask = new ScriptParser(cancellationTokenSource.Token);
+                        var parsed = parsingTask.GetTypesInScript(kvp.Value, out IList<ScriptParser.BlockInfo> parsedTypes);
+                        if (parsed)
+                            types.TryAdd(kvp.Key, parsedTypes);
+                        else
+                            failedScripts.Add(kvp.Key);
+                    });
+
+                    tasks.Add(new Tuple<Task, CancellationTokenSource>(task, cancellationTokenSource));
+                }
+
+                foreach (var t in tasks)
+                    t.Item1.Wait();
+            }
+            finally
+            {
+                foreach (var t in tasks)
+                    t.Item2.Dispose();
+            }
+
+            if (failedScripts.Count > 0)
+            {
+                var message = new StringBuilder("The following scripts could not be checked:");
+                foreach (var s in failedScripts)
+                    message.Append($"\n{AssetDatabase.GetAssetPath(s)}");
+                UnityEngine.Debug.LogWarning(message);
+            }
+
+            // Types are sorted randomly due to parallelism, therefore need to be sorted before returning
+            var sortedTypes = monoScriptContents.Where(x => types.ContainsKey(x.Key))
+                .Select(x => new KeyValuePair<MonoScript, IList<ScriptParser.BlockInfo>>(x.Key, types[x.Key]))
+                .ToDictionary(t => t.Key, t => t.Value);
+
+            return sortedTypes;
+        }
+
+        /// <summary>
+        /// A simple script parser class to detect types declared within a script
+        /// </summary>
+        private class ScriptParser
+        {
+            /// <summary>
+            /// Types that can be identified by the script parser
+            /// </summary>
+            public enum TypeName
+            {
+                Undefined,
+                Namespace,
+                Class,
+                Struct,
+                Interface,
+                Enum,
+                IdentationStart,
+                IdentationEnd
+            }
+
+            /// <summary>
+            /// A class containing information about each block of a C# script
+            /// </summary>
+            /// <remarks> A block in this context is defined as script text that is contained within curly brackets.
+            /// If it's a type, it may have a preceding name and a namespace
+            /// </remarks>
+            public class BlockInfo
+            {
+                public TypeName TypeName = TypeName.Undefined;
+                public string Name = string.Empty;
+                public string FullName = string.Empty;
+                public string Namespace = string.Empty;
+                public int FoundIndex;
+                public int StartIndex;
+
+                public BlockInfo ParentBlock;
+
+                public string GetReflectionFriendlyFullName()
+                {
+                    StringBuilder sb = new StringBuilder(FullName);
+                    for (int i = sb.Length - 1; i >= Namespace.Length + 1; i--)
+                        if (sb[i] == '.')
+                            sb[i] = '+';
+
+                    return sb.ToString();
+                }
+            }
+
+            private CancellationToken _token;
+
+            public ScriptParser(CancellationToken token)
+            {
+                _token = token;
+            }
+
+            public bool GetTypesInScript(string text, out IList<BlockInfo> types)
+            {
+                types = null;
+
+                try
+                {
+                    var sanitized = SanitizeScript(text);
+                    types = ScanForTypes(sanitized);
+                    return true;
+                }
+                catch
+                {
+                    return false;
+                }
+            }
+
+            private string SanitizeScript(string source)
+            {
+                var sb = new StringBuilder(source);
+
+                // Remove comments and strings
+                sb = RemoveStringsAndComments(sb);
+
+                // Replace newlines with spaces
+                sb.Replace("\r", " ").Replace("\n", " ");
+
+                // Space out the brackets
+                sb.Replace("{", " { ").Replace("}", " } ");
+
+                // Insert a space at the start for more convenient parsing
+                sb.Insert(0, " ");
+
+                // Remove repeating spaces
+                var sanitized = Regex.Replace(sb.ToString(), @"\s{2,}", " ");
+
+                return sanitized;
+            }
+
+            private StringBuilder RemoveStringsAndComments(StringBuilder sb)
+            {
+                void CheckStringIdentifiers(int index, out bool isVerbatim, out bool isInterpolated)
+                {
+                    isVerbatim = false;
+                    isInterpolated = false;
+
+                    string precedingChars = string.Empty;
+                    for (int i = index - 1; i >= 0; i--)
+                    {
+                        if (sb[i] == ' ')
+                            break;
+                        precedingChars += sb[i];
+                    }
+
+                    if (precedingChars.Contains("@"))
+                        isVerbatim = true;
+                    if (precedingChars.Contains("$"))
+                        isInterpolated = true;
+                }
+
+                bool IsRegion(int index)
+                {
+                    if (sb.Length - index < "#region".Length)
+                        return false;
+                    if (sb[index] == '#' && sb[index + 1] == 'r' && sb[index + 2] == 'e' && sb[index + 3] == 'g' && sb[index + 4] == 'i' &&
+                        sb[index + 5] == 'o' && sb[index + 6] == 'n')
+                        return true;
+                    return false;
+                }
+
+                var removeRanges = new List<Tuple<int, int>>();
+
+                for (int i = 0; i < sb.Length; i++)
+                {
+                    _token.ThrowIfCancellationRequested();
+
+                    // Comment code
+                    if (sb[i] == '/')
+                    {
+                        if (sb[i + 1] == '/')
+                        {
+                            for (int j = i + 1; j < sb.Length; j++)
+                            {
+                                _token.ThrowIfCancellationRequested();
+                                if (sb[j] == '\n' || j == sb.Length - 1)
+                                {
+                                    removeRanges.Add(new Tuple<int, int>(i, j - i + 1));
+                                    i = j;
+                                    break;
+                                }
+                            }
+                        }
+                        else if (sb[i + 1] == '*')
+                        {
+                            for (int j = i + 2; j < sb.Length; j++)
+                            {
+                                _token.ThrowIfCancellationRequested();
+                                if (sb[j] == '/' && sb[j - 1] == '*')
+                                {
+                                    removeRanges.Add(new Tuple<int, int>(i, j - i + 1));
+                                    i = j + 1;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    // Char code
+                    else if (sb[i] == '\'')
+                    {
+                        for (int j = i + 1; j < sb.Length; j++)
+                        {
+                            _token.ThrowIfCancellationRequested();
+                            if (sb[j] == '\'')
+                            {
+                                if (sb[j - 1] == '\\')
+                                {
+                                    int slashCount = 0;
+                                    int k = j - 1;
+                                    while (sb[k--] == '\\')
+                                        slashCount++;
+                                    if (slashCount % 2 != 0)
+                                        continue;
+                                }
+                                removeRanges.Add(new Tuple<int, int>(i, j - i + 1));
+                                i = j;
+                                break;
+                            }
+                        }
+                    }
+                    // String code
+                    else if (sb[i] == '"')
+                    {
+                        if (sb[i - 1] == '\'' && sb[i + 1] == '\'' || (sb[i - 2] == '\'' && sb[i - 1] == '\\' && sb[i + 1] == '\''))
+                            continue;
+
+                        CheckStringIdentifiers(i, out bool isVerbatim, out bool isInterpolated);
+
+                        var bracketCount = 0;
+                        bool interpolationEnd = true;
+                        for (int j = i + 1; j < sb.Length; j++)
+                        {
+                            _token.ThrowIfCancellationRequested();
+                            if (isInterpolated && (sb[j] == '{' || sb[j] == '}'))
+                            {
+                                if (sb[j] == '{')
+                                {
+                                    if (sb[j + 1] != '{')
+                                        bracketCount++;
+                                    else
+                                        j += 1;
+                                }
+                                else if (sb[j] == '}')
+                                {
+                                    if (sb[j + 1] != '}')
+                                        bracketCount--;
+                                    else
+                                        j += 1;
+                                }
+
+                                if (bracketCount == 0)
+                                    interpolationEnd = true;
+                                else
+                                    interpolationEnd = false;
+
+                                continue;
+                            }
+
+                            if (sb[j] == '\"')
+                            {
+                                if (isVerbatim)
+                                {
+                                    if (sb[j + 1] != '\"')
+                                    {
+                                        if (!isInterpolated || isInterpolated && interpolationEnd == true)
+                                        {
+                                            removeRanges.Add(new Tuple<int, int>(i, j - i + 1));
+                                            i = j + 1;
+                                            break;
+                                        }
+                                    }
+                                    else
+                                        j += 1;
+                                }
+                                else
+                                {
+                                    bool endOfComment = false;
+                                    if (sb[j - 1] != '\\')
+                                        endOfComment = true;
+                                    else
+                                    {
+                                        int slashCount = 0;
+                                        int k = j - 1;
+                                        while (sb[k--] == '\\')
+                                            slashCount++;
+                                        if (slashCount % 2 == 0)
+                                            endOfComment = true;
+                                    }
+
+                                    if (!isInterpolated && endOfComment || (isInterpolated && interpolationEnd && endOfComment))
+                                    {
+                                        removeRanges.Add(new Tuple<int, int>(i, j - i + 1));
+                                        i = j + 1;
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    // Region code
+                    else if (IsRegion(i))
+                    {
+                        i += "#region".Length;
+                        for (int j = i; j < sb.Length; j++)
+                        {
+                            _token.ThrowIfCancellationRequested();
+                            if (sb[j] == '\n')
+                            {
+                                removeRanges.Add(new Tuple<int, int>(i, j - i + 1));
+                                i = j;
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                for (int i = removeRanges.Count - 1; i >= 0; i--)
+                    sb = sb.Remove(removeRanges[i].Item1, removeRanges[i].Item2);
+
+                return sb;
+            }
+
+            private IList<BlockInfo> ScanForTypes(string script)
+            {
+                var typeList = new SortedList<int, BlockInfo>();
+                BlockInfo currentActiveBlock = new BlockInfo();
+
+                int i = 0;
+
+                BlockInfo nextNamespace = null;
+                BlockInfo nextClass = null;
+                BlockInfo nextStruct = null;
+                BlockInfo nextInterface = null;
+                BlockInfo nextEnum = null;
+
+                while (i < script.Length)
+                {
+                    _token.ThrowIfCancellationRequested();
+                    if (nextNamespace == null)
+                        nextNamespace = FindNextTypeBlock(script, i, TypeName.Namespace);
+                    if (nextClass == null)
+                        nextClass = FindNextTypeBlock(script, i, TypeName.Class);
+                    if (nextStruct == null)
+                        nextStruct = FindNextTypeBlock(script, i, TypeName.Struct);
+                    if (nextInterface == null)
+                        nextInterface = FindNextTypeBlock(script, i, TypeName.Interface);
+                    if (nextEnum == null)
+                        nextEnum = FindNextTypeBlock(script, i, TypeName.Enum);
+
+                    var nextIdentationIncrease = FindNextTypeBlock(script, i, TypeName.IdentationStart);
+                    var nextIdentationDecrease = FindNextTypeBlock(script, i, TypeName.IdentationEnd);
+
+                    if (!TryFindClosestBlock(out var closestBlock, nextNamespace, nextClass,
+                        nextStruct, nextInterface, nextEnum, nextIdentationIncrease, nextIdentationDecrease))
+                        break;
+
+                    switch (closestBlock)
+                    {
+                        case var _ when closestBlock == nextIdentationIncrease:
+                            closestBlock.ParentBlock = currentActiveBlock;
+                            currentActiveBlock = closestBlock;
+                            break;
+                        case var _ when closestBlock == nextIdentationDecrease:
+                            if (currentActiveBlock.TypeName != TypeName.Undefined)
+                                typeList.Add(currentActiveBlock.StartIndex, currentActiveBlock);
+                            currentActiveBlock = currentActiveBlock.ParentBlock;
+                            break;
+                        case var _ when closestBlock == nextNamespace:
+                            closestBlock.Namespace = currentActiveBlock.TypeName == TypeName.Namespace ? currentActiveBlock.FullName : currentActiveBlock.Namespace;
+                            closestBlock.FullName = string.IsNullOrEmpty(currentActiveBlock.FullName) ? closestBlock.Name : $"{currentActiveBlock.FullName}.{closestBlock.Name}";
+                            closestBlock.ParentBlock = currentActiveBlock;
+                            currentActiveBlock = closestBlock;
+                            nextNamespace = null;
+                            break;
+                        case var _ when closestBlock == nextClass:
+                        case var _ when closestBlock == nextStruct:
+                        case var _ when closestBlock == nextInterface:
+                        case var _ when closestBlock == nextEnum:
+                            closestBlock.FullName = string.IsNullOrEmpty(currentActiveBlock.FullName) ? closestBlock.Name : $"{currentActiveBlock.FullName}.{closestBlock.Name}";
+                            closestBlock.Namespace = currentActiveBlock.TypeName == TypeName.Namespace ? currentActiveBlock.FullName : currentActiveBlock.Namespace;
+                            closestBlock.ParentBlock = currentActiveBlock;
+                            currentActiveBlock = closestBlock;
+                            switch (closestBlock)
+                            {
+                                case var _ when closestBlock == nextClass:
+                                    nextClass = null;
+                                    break;
+                                case var _ when closestBlock == nextStruct:
+                                    nextStruct = null;
+                                    break;
+                                case var _ when closestBlock == nextInterface:
+                                    nextInterface = null;
+                                    break;
+                                case var _ when closestBlock == nextEnum:
+                                    nextEnum = null;
+                                    break;
+                            }
+                            break;
+                    }
+
+                    i = closestBlock.StartIndex;
+                }
+
+                return typeList.Select(x => x.Value).ToList();
+            }
+
+            private bool TryFindClosestBlock(out BlockInfo closestBlock, params BlockInfo[] blocks)
+            {
+                closestBlock = null;
+                for (int i = 0; i < blocks.Length; i++)
+                {
+                    if (blocks[i].FoundIndex == -1)
+                        continue;
+
+                    if (closestBlock == null || closestBlock.FoundIndex > blocks[i].FoundIndex)
+                        closestBlock = blocks[i];
+                }
+
+                return closestBlock != null;
+            }
+
+            private BlockInfo FindNextTypeBlock(string text, int startIndex, TypeName blockType)
+            {
+                string typeKeyword;
+                switch (blockType)
+                {
+                    case TypeName.Namespace:
+                        typeKeyword = "namespace";
+                        break;
+                    case TypeName.Class:
+                        typeKeyword = "class";
+                        break;
+                    case TypeName.Struct:
+                        typeKeyword = "struct";
+                        break;
+                    case TypeName.Interface:
+                        typeKeyword = "interface";
+                        break;
+                    case TypeName.Enum:
+                        typeKeyword = "enum";
+                        break;
+                    case TypeName.IdentationStart:
+                        var identationStart = text.IndexOf("{", startIndex);
+                        return new BlockInfo() { FoundIndex = identationStart, StartIndex = identationStart + 1, TypeName = TypeName.Undefined };
+                    case TypeName.IdentationEnd:
+                        var identationEnd = text.IndexOf("}", startIndex);
+                        return new BlockInfo() { FoundIndex = identationEnd, StartIndex = identationEnd + 1, TypeName = TypeName.Undefined };
+                    default:
+                        throw new ArgumentException("Invalid block type provided");
+                }
+
+                int start = -1;
+                int blockStart = -1;
+                string name = string.Empty;
+                while (startIndex < text.Length)
+                {
+                    _token.ThrowIfCancellationRequested();
+                    start = text.IndexOf($" {typeKeyword} ", startIndex);
+                    if (start == -1)
+                        return new BlockInfo { FoundIndex = -1 };
+
+                    // Check if the caught type keyword matches the type definition
+                    var openingBracket = text.IndexOf("{", start);
+                    if (openingBracket == -1)
+                        return new BlockInfo { FoundIndex = -1 };
+
+                    var declaration = text.Substring(start, openingBracket - start);
+                    var split = declaration.Split(' ');
+
+                    // Namespace detection
+                    if (typeKeyword == "namespace")
+                    {
+                        // Expected result: [null] [namespace] [null]
+                        if (split.Length == 4)
+                        {
+                            name = split[2];
+                            blockStart = openingBracket + 1;
+                            break;
+                        }
+                        else
+                            startIndex = openingBracket + 1;
+                    }
+                    // Class, Interface, Struct, Enum detection
+                    else
+                    {
+                        // Expected result: [null] [keywordName] [typeName] ... [null]
+                        // Skip any keywords that only contains [null] [keywordName] [null]
+                        if (split.Length != 3)
+                        {
+                            name = split[2];
+                            blockStart = openingBracket + 1;
+                            break;
+                        }
+                        else
+                            startIndex = openingBracket + 1;
+                    }
+                }
+
+                var info = new BlockInfo() { FoundIndex = start, StartIndex = blockStart, Name = name, TypeName = blockType };
+                return info;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/ScriptUtilityService.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/ScriptUtilityService.cs.meta
new file mode 100644
index 0000000..d89e8d7
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/ScriptUtilityService.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 9db4298044e2add44bc3aa6ba898d7c3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/Validation/ScriptUtilityService.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/ValidatorServiceProvider.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/ValidatorServiceProvider.cs
new file mode 100644
index 0000000..67f62ef
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/ValidatorServiceProvider.cs
@@ -0,0 +1,24 @@
+using AssetStoreTools.Utility;
+using AssetStoreTools.Validator.Services.Validation;
+
+namespace AssetStoreTools.Validator.Services
+{
+    internal class ValidatorServiceProvider : ServiceProvider<IValidatorService>
+    {
+        public static ValidatorServiceProvider Instance => _instance ?? (_instance = new ValidatorServiceProvider());
+        private static ValidatorServiceProvider _instance;
+
+        private ValidatorServiceProvider() { }
+
+        protected override void RegisterServices()
+        {
+            Register<ICachingService, CachingService>();
+            Register<IAssetUtilityService, AssetUtilityService>();
+            Register<IFileSignatureUtilityService, FileSignatureUtilityService>();
+            Register<IMeshUtilityService, MeshUtilityService>();
+            Register<IModelUtilityService, ModelUtilityService>();
+            Register<ISceneUtilityService, SceneUtilityService>();
+            Register<IScriptUtilityService, ScriptUtilityService>();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/ValidatorServiceProvider.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/ValidatorServiceProvider.cs.meta
new file mode 100644
index 0000000..888d94f
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/ValidatorServiceProvider.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 47ac495c61171824abb2b72b1b7ef676
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Services/ValidatorServiceProvider.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions.meta
new file mode 100644
index 0000000..7b3ebc2
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 462cf5f916fad974a831f6a44aadcc82
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/AutomatedTest.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/AutomatedTest.cs
new file mode 100644
index 0000000..3d92470
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/AutomatedTest.cs	
@@ -0,0 +1,121 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using UnityEngine;
+
+namespace AssetStoreTools.Validator.TestDefinitions
+{
+    internal class AutomatedTest : ValidationTest
+    {
+        public AutomatedTest(ValidationTestScriptableObject source) : base(source) { }
+
+        public override void Run(ITestConfig config)
+        {
+            Type testClass = null;
+            MethodInfo testMethod = null;
+
+            try
+            {
+                ValidateTestMethod(ref testClass, ref testMethod);
+                ValidateConfig(config);
+            }
+            catch (Exception e)
+            {
+                Debug.LogError(e.Message);
+                return;
+            }
+
+            object testClassInstance;
+            try
+            {
+                testClassInstance = CreateInstance(testClass, config);
+            }
+            catch (Exception e)
+            {
+                Debug.LogError($"Could not create an instance of class {testClass}:\n{e}");
+                return;
+            }
+
+            try
+            {
+                Result = (TestResult)testMethod.Invoke(testClassInstance, new object[0]);
+            }
+            catch (Exception e)
+            {
+                var result = new TestResult() { Status = TestResultStatus.Undefined };
+                result.AddMessage("An exception was caught when running this test case. See Console for more details");
+                Debug.LogError($"An exception was caught when running validation for test case '{Title}'\n{e}");
+                Result = result;
+            }
+        }
+
+        private void ValidateTestMethod(ref Type testClass, ref MethodInfo testMethod)
+        {
+            if (TestScript == null || (testClass = TestScript.GetClass()) == null)
+                throw new Exception($"Cannot run test {Title} - Test Script class was not found");
+
+            var interfaces = testClass.GetInterfaces();
+            if (!interfaces.Contains(typeof(ITestScript)))
+                throw new Exception($"Cannot run test {Title} - Test Script class is not derived from {nameof(ITestScript)}");
+
+            testMethod = testClass.GetMethod("Run");
+            if (testMethod == null)
+                throw new Exception($"Cannot run test {Title} - Run() method was not found");
+        }
+
+        private void ValidateConfig(ITestConfig config)
+        {
+            switch (ValidationType)
+            {
+                case ValidationType.Generic:
+                case ValidationType.UnityPackage:
+                    if (config is GenericTestConfig)
+                        return;
+                    break;
+                default:
+                    throw new NotImplementedException("Undefined validation type");
+            }
+
+            throw new Exception("Config does not match the validation type");
+        }
+
+        private object CreateInstance(Type testClass, ITestConfig testConfig)
+        {
+            var constructors = testClass.GetConstructors();
+            if (constructors.Length != 1)
+                throw new Exception($"Test class {testClass} should only contain a single constructor");
+
+            var constructor = constructors[0];
+            var expectedParameters = constructor.GetParameters();
+            var parametersToUse = new List<object>();
+            foreach (var expectedParam in expectedParameters)
+            {
+                var paramType = expectedParam.ParameterType;
+
+                if (paramType == testConfig.GetType())
+                {
+                    parametersToUse.Add(testConfig);
+                    continue;
+                }
+
+                if (typeof(IValidatorService).IsAssignableFrom(paramType))
+                {
+                    var matchingService = ValidatorServiceProvider.Instance.GetService(paramType);
+                    if (matchingService == null)
+                        throw new Exception($"Service {paramType} is not registered and could not be retrieved");
+
+                    parametersToUse.Add(matchingService);
+                    continue;
+                }
+
+                throw new Exception($"Invalid parameter type: {paramType}");
+            }
+
+            var instance = constructor.Invoke(parametersToUse.ToArray());
+            return instance;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/AutomatedTest.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/AutomatedTest.cs.meta
new file mode 100644
index 0000000..c3fca08
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/AutomatedTest.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: b284048af6fef0d49b8c3a37f7083d04
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/AutomatedTest.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/GenericTestConfig.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/GenericTestConfig.cs
new file mode 100644
index 0000000..e91c0ae
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/GenericTestConfig.cs	
@@ -0,0 +1,7 @@
+namespace AssetStoreTools.Validator.TestDefinitions
+{
+    internal class GenericTestConfig : ITestConfig
+    {
+        public string[] ValidationPaths { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/GenericTestConfig.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/GenericTestConfig.cs.meta
new file mode 100644
index 0000000..00f3efa
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/GenericTestConfig.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: ba1ae4e7b45a6c84ca8ad0eb391bf95d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/GenericTestConfig.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/ITestConfig.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/ITestConfig.cs
new file mode 100644
index 0000000..4c4d858
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/ITestConfig.cs	
@@ -0,0 +1,4 @@
+namespace AssetStoreTools.Validator.TestDefinitions
+{
+    internal interface ITestConfig { }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/ITestConfig.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/ITestConfig.cs.meta
new file mode 100644
index 0000000..9bfe992
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/ITestConfig.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: c7e57766d04022c4dac58caf8ebe339a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/ITestConfig.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/ITestScript.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/ITestScript.cs
new file mode 100644
index 0000000..aa645c0
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/ITestScript.cs	
@@ -0,0 +1,9 @@
+using AssetStoreTools.Validator.Data;
+
+namespace AssetStoreTools.Validator.TestDefinitions
+{
+    internal interface ITestScript
+    {
+        TestResult Run();
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/ITestScript.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/ITestScript.cs.meta
new file mode 100644
index 0000000..e2246b1
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/ITestScript.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 839ef1f3e773ab347b66932d3f810aec
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/ITestScript.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/Scriptable Objects.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/Scriptable Objects.meta
new file mode 100644
index 0000000..1dfe2af
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/Scriptable Objects.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d62652f91f698904ea662c6ab252ea59
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/Scriptable Objects/AutomatedTestScriptableObject.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/Scriptable Objects/AutomatedTestScriptableObject.cs
new file mode 100644
index 0000000..fa493fb
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/Scriptable Objects/AutomatedTestScriptableObject.cs	
@@ -0,0 +1,11 @@
+#if UNITY_ASTOOLS_DEVELOPMENT
+using UnityEngine;
+#endif
+
+namespace AssetStoreTools.Validator.TestDefinitions
+{
+#if UNITY_ASTOOLS_DEVELOPMENT
+    [CreateAssetMenu(fileName = "AutomatedTest", menuName = "Asset Store Validator/Automated Test")]
+#endif
+    internal class AutomatedTestScriptableObject : ValidationTestScriptableObject { }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/Scriptable Objects/AutomatedTestScriptableObject.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/Scriptable Objects/AutomatedTestScriptableObject.cs.meta
new file mode 100644
index 0000000..bd737f4
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/Scriptable Objects/AutomatedTestScriptableObject.cs.meta	
@@ -0,0 +1,19 @@
+fileFormatVersion: 2
+guid: d813ff809ae82f643bf975031305d541
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/Scriptable
+    Objects/AutomatedTestScriptableObject.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/Scriptable Objects/Editor.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/Scriptable Objects/Editor.meta
new file mode 100644
index 0000000..eebb867
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/Scriptable Objects/Editor.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7cd52466a2239344d90c3043b7afc1e4
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/Scriptable Objects/Editor/ValidationTestScriptableObjectInspector.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/Scriptable Objects/Editor/ValidationTestScriptableObjectInspector.cs
new file mode 100644
index 0000000..36025a8
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/Scriptable Objects/Editor/ValidationTestScriptableObjectInspector.cs	
@@ -0,0 +1,196 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Utility;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+
+namespace AssetStoreTools.Validator.TestDefinitions
+{
+    [CustomEditor(typeof(ValidationTestScriptableObject), true)]
+    internal class ValidationTestScriptableObjectInspector : UnityEditor.Editor
+    {
+        private enum FilterSeverity
+        {
+            Warning,
+            Fail
+        }
+
+        private enum FilterType
+        {
+            UseFilter,
+            ExcludeFilter
+        }
+
+        private ValidationTestScriptableObject _data;
+        private ValidationTestScriptableObject[] _allObjects;
+
+        private SerializedProperty _script;
+        private SerializedProperty _validationType;
+
+        private SerializedProperty _testScript;
+        private SerializedProperty _category;
+        private SerializedProperty _failFilterProperty;
+        private SerializedProperty _isInclusiveProperty;
+        private SerializedProperty _appliesToSubCategories;
+        private SerializedProperty _categoryFilter;
+
+        private bool _hadChanges;
+
+        private void OnEnable()
+        {
+            if (target == null) return;
+
+            _data = target as ValidationTestScriptableObject;
+
+            _script = serializedObject.FindProperty("m_Script");
+
+            _validationType = serializedObject.FindProperty(nameof(ValidationTestScriptableObject.ValidationType));
+
+            _testScript = serializedObject.FindProperty(nameof(ValidationTestScriptableObject.TestScript));
+            _category = serializedObject.FindProperty(nameof(ValidationTestScriptableObject.CategoryInfo));
+            _failFilterProperty = _category.FindPropertyRelative(nameof(ValidationTestScriptableObject.CategoryInfo.IsFailFilter));
+            _isInclusiveProperty = _category.FindPropertyRelative(nameof(ValidationTestScriptableObject.CategoryInfo.IsInclusiveFilter));
+            _appliesToSubCategories = _category.FindPropertyRelative(nameof(ValidationTestScriptableObject.CategoryInfo.AppliesToSubCategories));
+            _categoryFilter = _category.FindPropertyRelative(nameof(ValidationTestScriptableObject.CategoryInfo.Filter));
+
+            _allObjects = ValidatorUtility.GetAutomatedTestCases(ValidatorUtility.SortType.Id);
+            _hadChanges = false;
+        }
+
+        public override void OnInspectorGUI()
+        {
+            serializedObject.Update();
+
+            EditorGUILayout.LabelField(GetInspectorTitle(), new GUIStyle(EditorStyles.centeredGreyMiniLabel) { fontSize = 24 }, GUILayout.MinHeight(50));
+
+            EditorGUI.BeginDisabledGroup(true);
+            EditorGUILayout.PropertyField(_script);
+
+            EditorGUI.BeginChangeCheck();
+            // ID field
+            EditorGUILayout.IntField("Test Id", _data.Id);
+            if (!ValidateID())
+                EditorGUILayout.HelpBox("ID is already in use", MessageType.Warning);
+            EditorGUI.EndDisabledGroup();
+
+            EditorGUILayout.Space(8);
+            EditorGUILayout.LabelField("Test Data", new GUIStyle(EditorStyles.centeredGreyMiniLabel) { alignment = TextAnchor.MiddleLeft, fontSize = 14, padding = new RectOffset(0, 0, 0, 0) });
+
+            // Validation Type
+            var validationType = (ValidationType)EditorGUILayout.EnumPopup("Validation Type", (ValidationType)_validationType.enumValueIndex);
+            _validationType.enumValueIndex = (int)validationType;
+
+            // Other fields
+            _data.Title = EditorGUILayout.TextField("Title", _data.Title);
+            if (string.IsNullOrEmpty(_data.Title))
+                EditorGUILayout.HelpBox("Title cannot be empty", MessageType.Warning);
+
+            EditorGUILayout.LabelField("Description");
+            GUIStyle myTextAreaStyle = new GUIStyle(EditorStyles.textArea) { wordWrap = true };
+            _data.Description = EditorGUILayout.TextArea(_data.Description, myTextAreaStyle);
+
+            // Test script
+            EditorGUILayout.Space(8);
+            EditorGUILayout.LabelField("Test Script", new GUIStyle(EditorStyles.centeredGreyMiniLabel) { alignment = TextAnchor.MiddleLeft, fontSize = 14, padding = new RectOffset(0, 0, 0, 0) });
+
+            EditorGUILayout.PropertyField(_testScript);
+            if (_testScript.objectReferenceValue != null)
+            {
+                var generatedScriptType = (_testScript.objectReferenceValue as MonoScript).GetClass();
+                if (generatedScriptType == null || !generatedScriptType.GetInterfaces().Contains(typeof(ITestScript)))
+                    EditorGUILayout.HelpBox($"Test Script does not derive from {nameof(ITestScript)}. Test execution will fail", MessageType.Warning);
+            }
+            else if (!string.IsNullOrEmpty(_data.Title))
+            {
+                var generatedScriptName = GenerateTestScriptName();
+                EditorGUILayout.LabelField($"Proposed script name: <i>{generatedScriptName}.cs</i>", new GUIStyle("Label") { richText = true });
+                EditorGUILayout.Space();
+                EditorGUILayout.BeginHorizontal();
+                GUILayout.FlexibleSpace();
+                if (GUILayout.Button("Generate Test Method Script", GUILayout.MaxWidth(200f)))
+                {
+                    var generatedScript = ValidatorUtility.GenerateTestScript(generatedScriptName, (ValidationType)_validationType.enumValueIndex);
+                    _testScript.objectReferenceValue = generatedScript;
+                }
+                EditorGUILayout.EndHorizontal();
+            }
+
+            // Variable Sevetity Options
+            EditorGUILayout.Space(8);
+            EditorGUILayout.LabelField("Variable Severity Status Filtering", new GUIStyle(EditorStyles.centeredGreyMiniLabel) { alignment = TextAnchor.MiddleLeft, fontSize = 14, padding = new RectOffset(0, 0, 0, 0) });
+
+            var filterSeverity = (FilterSeverity)EditorGUILayout.EnumPopup("Fail Type", _failFilterProperty.boolValue ? FilterSeverity.Fail : FilterSeverity.Warning);
+            _failFilterProperty.boolValue = filterSeverity == FilterSeverity.Fail ? true : false;
+            var filterType = (FilterType)EditorGUILayout.EnumPopup("Filtering rule", _isInclusiveProperty.boolValue ? FilterType.UseFilter : FilterType.ExcludeFilter);
+            _isInclusiveProperty.boolValue = filterType == FilterType.UseFilter ? true : false;
+
+            EditorGUILayout.PropertyField(_appliesToSubCategories);
+
+            EditorGUILayout.Space(10);
+
+            EditorGUILayout.BeginHorizontal(GUI.skin.FindStyle("HelpBox"));
+            EditorGUILayout.LabelField(GetFilterDescription(_failFilterProperty.boolValue, _isInclusiveProperty.boolValue), new GUIStyle(GUI.skin.label) { wordWrap = true, richText = true });
+            EditorGUILayout.EndHorizontal();
+
+            EditorGUILayout.Space(10);
+
+            EditorGUILayout.PropertyField(_categoryFilter);
+
+            if (EditorGUI.EndChangeCheck())
+            {
+                EditorUtility.SetDirty(target);
+                _hadChanges = true;
+            }
+
+            _hadChanges = serializedObject.ApplyModifiedProperties() || _hadChanges;
+        }
+
+        private string GetInspectorTitle()
+        {
+            switch (_data)
+            {
+                case AutomatedTestScriptableObject _:
+                    return "Automated Test";
+                default:
+                    return "Miscellaneous Test";
+            }
+        }
+
+        private string GenerateTestScriptName()
+        {
+            var name = _data.Title.Replace(" ", "");
+            return name;
+        }
+
+        private string GetFilterDescription(bool isFailFilter, bool isInclusive)
+        {
+            string text = $"When a <i>{TestResultStatus.VariableSeverityIssue}</i> result type is returned from the test method:\n\n";
+            if (isFailFilter)
+            {
+                if (isInclusive)
+                    return text + "• <b>Categories IN the filter</b> will result in a <color=red>FAIL</color>.\n• <b>Categories NOT in the filter</b> will result in a <color=yellow>WARNING</color>";
+                else
+                    return text + "• <b>Categories NOT in the filter</b> will result in a <color=red>FAIL</color>.\n• <b>Categories IN the filter</b> will result in a <color=yellow>WARNING</color>";
+            }
+            else
+            {
+                if (isInclusive)
+                    return text + "• <b>Categories IN the filter</b> will result in a <color=yellow>WARNING</color>.\n• <b>Categories NOT in the filter</b> will result in a <color=red>FAIL</color>";
+                else
+                    return text + "• <b>Categories NOT in the filter</b> will result in a <color=yellow>WARNING</color>.\n• <b>Categories IN the filter</b> will result in a <color=red>FAIL</color>";
+            }
+        }
+
+        private bool ValidateID()
+        {
+            return !_allObjects.Any(x => x.Id == _data.Id && x != _data);
+        }
+
+        private void OnDisable()
+        {
+            if (!_hadChanges) return;
+            AssetDatabase.SaveAssets();
+            AssetDatabase.Refresh();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/Scriptable Objects/Editor/ValidationTestScriptableObjectInspector.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/Scriptable Objects/Editor/ValidationTestScriptableObjectInspector.cs.meta
new file mode 100644
index 0000000..ad96ec9
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/Scriptable Objects/Editor/ValidationTestScriptableObjectInspector.cs.meta	
@@ -0,0 +1,19 @@
+fileFormatVersion: 2
+guid: 06d76b0e6df91eb43ac956f883c4a2da
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/Scriptable
+    Objects/Editor/ValidationTestScriptableObjectInspector.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/Scriptable Objects/ValidationTestScriptableObject.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/Scriptable Objects/ValidationTestScriptableObject.cs
new file mode 100644
index 0000000..d700dfb
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/Scriptable Objects/ValidationTestScriptableObject.cs	
@@ -0,0 +1,35 @@
+using AssetStoreTools.Validator.Categories;
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Utility;
+using UnityEditor;
+using UnityEngine;
+
+namespace AssetStoreTools.Validator.TestDefinitions
+{
+    internal abstract class ValidationTestScriptableObject : ScriptableObject
+    {
+        [SerializeField, HideInInspector]
+        private bool HasBeenInitialized;
+
+        public int Id;
+        public string Title;
+        public string Description;
+        public ValidatorCategory CategoryInfo;
+        public ValidationType ValidationType;
+        public MonoScript TestScript;
+
+        private void OnEnable()
+        {
+            // To do: maybe replace with Custom Inspector
+            if (HasBeenInitialized)
+                return;
+
+            var existingTestCases = ValidatorUtility.GetAutomatedTestCases(ValidatorUtility.SortType.Id);
+            if (existingTestCases.Length > 0)
+                Id = existingTestCases[existingTestCases.Length - 1].Id + 1;
+            else
+                Id = 1;
+            HasBeenInitialized = true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/Scriptable Objects/ValidationTestScriptableObject.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/Scriptable Objects/ValidationTestScriptableObject.cs.meta
new file mode 100644
index 0000000..943d5d8
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/Scriptable Objects/ValidationTestScriptableObject.cs.meta	
@@ -0,0 +1,19 @@
+fileFormatVersion: 2
+guid: 11c2422f057b75a458e184d169a00eb6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/Scriptable
+    Objects/ValidationTestScriptableObject.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/ValidationTest.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/ValidationTest.cs
new file mode 100644
index 0000000..4a4bb66
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/ValidationTest.cs	
@@ -0,0 +1,38 @@
+using AssetStoreTools.Validator.Categories;
+using AssetStoreTools.Validator.Data;
+using UnityEditor;
+
+namespace AssetStoreTools.Validator.TestDefinitions
+{
+    internal abstract class ValidationTest
+    {
+        public int Id;
+        public string Title;
+        public string Description;
+        public MonoScript TestScript;
+
+        public ValidationType ValidationType;
+        public ValidatorCategory CategoryInfo;
+
+        public TestResult Result;
+
+        protected ValidationTest(ValidationTestScriptableObject source)
+        {
+            Id = source.Id;
+            Title = source.Title;
+            Description = source.Description;
+            TestScript = source.TestScript;
+            CategoryInfo = source.CategoryInfo;
+            ValidationType = source.ValidationType;
+            Result = new TestResult();
+        }
+
+        public abstract void Run(ITestConfig config);
+
+        public string Slugify(string value)
+        {
+            string newValue = value.Replace(' ', '-').ToLower();
+            return newValue;
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/ValidationTest.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/ValidationTest.cs.meta
new file mode 100644
index 0000000..a5cadef
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/ValidationTest.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 095d629656748914bb6202598876fdf4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Definitions/ValidationTest.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods.meta
new file mode 100644
index 0000000..5a3363e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: daedaf78228b5184297e7ca334ea2a12
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic.meta
new file mode 100644
index 0000000..a9b691e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ecfb23f95f16d2347a4063411aad8063
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckAnimationClips.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckAnimationClips.cs
new file mode 100644
index 0000000..c54c43a
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckAnimationClips.cs	
@@ -0,0 +1,64 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services.Validation;
+using AssetStoreTools.Validator.TestDefinitions;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor;
+using UnityObject = UnityEngine.Object;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class CheckAnimationClips : ITestScript
+    {
+        private static readonly string[] InvalidNames = new[] { "Take 001" };
+
+        private GenericTestConfig _config;
+        private IAssetUtilityService _assetUtility;
+
+        public CheckAnimationClips(GenericTestConfig config, IAssetUtilityService assetUtility)
+        {
+            _config = config;
+            _assetUtility = assetUtility;
+        }
+
+        public TestResult Run()
+        {
+            var result = new TestResult() { Status = TestResultStatus.Undefined };
+            var badModels = new Dictionary<UnityObject, List<UnityObject>>();
+            var models = _assetUtility.GetObjectsFromAssets<UnityObject>(_config.ValidationPaths, AssetType.Model);
+
+            foreach (var model in models)
+            {
+                var badClips = new List<UnityObject>();
+                var clips = AssetDatabase.LoadAllAssetsAtPath(_assetUtility.ObjectToAssetPath(model));
+                foreach (var clip in clips)
+                {
+                    if (InvalidNames.Any(x => x.ToLower().Equals(clip.name.ToLower())))
+                    {
+                        badClips.Add(clip);
+                    }
+                }
+
+                if (badClips.Count > 0)
+                    badModels.Add(model, badClips);
+            }
+
+            if (badModels.Count > 0)
+            {
+                result.Status = TestResultStatus.VariableSeverityIssue;
+                result.AddMessage("The following models have animation clips with invalid names. Animation clip names should be unique and reflective of the animation itself");
+                foreach (var kvp in badModels)
+                {
+                    result.AddMessage(_assetUtility.ObjectToAssetPath(kvp.Key), null, kvp.Value.ToArray());
+                }
+            }
+            else
+            {
+                result.AddMessage("No animation clips with invalid names were found!");
+                result.Status = TestResultStatus.Pass;
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckAnimationClips.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckAnimationClips.cs.meta
new file mode 100644
index 0000000..3e273b6
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckAnimationClips.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 7a28985886f182c4bacc89a44777c742
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckAnimationClips.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckAudioClipping.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckAudioClipping.cs
new file mode 100644
index 0000000..be8e384
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckAudioClipping.cs	
@@ -0,0 +1,128 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services.Validation;
+using AssetStoreTools.Validator.TestDefinitions;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class CheckAudioClipping : ITestScript
+    {
+        private GenericTestConfig _config;
+        private IAssetUtilityService _assetUtility;
+
+        public CheckAudioClipping(GenericTestConfig config, IAssetUtilityService assetUtility)
+        {
+            _config = config;
+            _assetUtility = assetUtility;
+        }
+
+        public TestResult Run()
+        {
+            // How many peaks above threshold are required for Audio Clips to be considered clipping
+            const int TOLERANCE = 2;
+            // Min. amount of consecutive samples above threshold required for peak detection
+            const int PEAK_STEPS = 1;
+            // Clipping threshold. More lenient here than Submission Guidelines (-0.3db) due to the problematic nature of 
+            // correctly determining how sensitive the audio clipping flagging should be, as well as to account for any
+            // distortion introduced when AudioClips are compresssed after importing to Unity.
+            const float THRESHOLD = -0.05f;
+            // Samples for 16-bit audio files
+            const float S16b = 32767f;
+            float clippingThreshold = (S16b - (S16b / (2 * Mathf.Log10(1 / S16b)) * THRESHOLD)) / S16b;
+            TestResult result = new TestResult();
+            var clippingAudioClips = new Dictionary<AudioClip, string>();
+
+            var losslessAudioClips = _assetUtility.GetObjectsFromAssets(_config.ValidationPaths, AssetType.NonLossyAudio).Select(x => x as AudioClip).ToList();
+            foreach (var clip in losslessAudioClips)
+            {
+                var path = AssetDatabase.GetAssetPath(clip.GetInstanceID());
+
+                if (IsClipping(clip, TOLERANCE, PEAK_STEPS, clippingThreshold))
+                    clippingAudioClips.Add(clip, path);
+            }
+
+            var lossyAudioClips = _assetUtility.GetObjectsFromAssets(_config.ValidationPaths, AssetType.LossyAudio).Select(x => x as AudioClip).ToList();
+            foreach (var clip in lossyAudioClips)
+            {
+                var path = AssetDatabase.GetAssetPath(clip.GetInstanceID());
+
+                if (IsClipping(clip, TOLERANCE, PEAK_STEPS, clippingThreshold))
+                    clippingAudioClips.Add(clip, path);
+            }
+
+            if (clippingAudioClips.Count > 0)
+            {
+                result.Status = TestResultStatus.VariableSeverityIssue;
+                result.AddMessage("The following AudioClips are clipping or are very close to 0db ceiling. Please ensure your exported audio files have at least 0.3db of headroom (should peak at no more than -0.3db):", null, clippingAudioClips.Select(x => x.Key).ToArray());
+            }
+            else
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("No clipping audio files were detected.");
+            }
+
+            return result;
+        }
+
+        private bool IsClipping(AudioClip clip, int tolerance, int peakTolerance, float clippingThreshold)
+        {
+            if (DetectNumPeaksAboveThreshold(clip, peakTolerance, clippingThreshold) >= tolerance)
+                return true;
+
+            return false;
+        }
+
+        private int DetectNumPeaksAboveThreshold(AudioClip clip, int peakTolerance, float clippingThreshold)
+        {
+            float[] samples = new float[clip.samples * clip.channels];
+            var data = clip.GetData(samples, 0);
+
+            float[] samplesLeft = samples.Where((s, i) => i % 2 == 0).ToArray();
+            float[] samplesRight = samples.Where((s, i) => i % 2 == 1).ToArray();
+
+            int peaks = 0;
+
+            peaks = GetPeaksInChannel(samplesLeft, peakTolerance, clippingThreshold) +
+                    GetPeaksInChannel(samplesRight, peakTolerance, clippingThreshold);
+
+            return peaks;
+        }
+
+        private int GetPeaksInChannel(float[] samples, int peakTolerance, float clippingThreshold)
+        {
+            int peaks = 0;
+            bool evalPeak = false;
+            int peakSteps = 0;
+            int step = 0;
+
+            while (step < samples.Length)
+            {
+                if (Mathf.Abs(samples[step]) >= clippingThreshold && evalPeak)
+                {
+                    peakSteps++;
+                }
+
+                if (Mathf.Abs(samples[step]) >= clippingThreshold && !evalPeak)
+                {
+                    evalPeak = true;
+                    peakSteps++;
+                }
+
+                if (Mathf.Abs(samples[step]) < clippingThreshold && evalPeak)
+                {
+                    evalPeak = false;
+                    if (peakSteps >= peakTolerance)
+                        peaks++;
+                    peakSteps = 0;
+                }
+
+                step++;
+            }
+
+            return peaks;
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckAudioClipping.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckAudioClipping.cs.meta
new file mode 100644
index 0000000..3d30638
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckAudioClipping.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: f604db0353da0cb46bb048f5cd37186f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckAudioClipping.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckColliders.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckColliders.cs
new file mode 100644
index 0000000..c8be5bb
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckColliders.cs	
@@ -0,0 +1,55 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services.Validation;
+using AssetStoreTools.Validator.TestDefinitions;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class CheckColliders : ITestScript
+    {
+        private GenericTestConfig _config;
+        private IAssetUtilityService _assetUtility;
+        private IMeshUtilityService _meshUtility;
+
+        public CheckColliders(GenericTestConfig config, IAssetUtilityService assetUtility, IMeshUtilityService meshUtility)
+        {
+            _config = config;
+            _assetUtility = assetUtility;
+            _meshUtility = meshUtility;
+        }
+
+        public TestResult Run()
+        {
+            var result = new TestResult() { Status = TestResultStatus.Undefined };
+
+            var prefabs = _assetUtility.GetObjectsFromAssets<GameObject>(_config.ValidationPaths, AssetType.Prefab);
+            var badPrefabs = new List<GameObject>();
+
+            foreach (var p in prefabs)
+            {
+                var meshes = _meshUtility.GetCustomMeshesInObject(p);
+
+                if (!p.isStatic || !meshes.Any())
+                    continue;
+
+                var colliders = p.GetComponentsInChildren<Collider>(true);
+                if (!colliders.Any())
+                    badPrefabs.Add(p);
+            }
+
+            if (badPrefabs.Count == 0)
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("All found prefabs have colliders!");
+                return result;
+            }
+
+            result.Status = TestResultStatus.VariableSeverityIssue;
+            result.AddMessage("The following prefabs contain meshes, but colliders were not found", null, badPrefabs.ToArray());
+
+            return result;
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckColliders.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckColliders.cs.meta
new file mode 100644
index 0000000..f5f4edf
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckColliders.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 308b3d7b7a883b949a14f47cfd5c7ebe
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckColliders.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckCompressedFiles.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckCompressedFiles.cs
new file mode 100644
index 0000000..6f8ce60
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckCompressedFiles.cs	
@@ -0,0 +1,121 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services.Validation;
+using AssetStoreTools.Validator.TestDefinitions;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using UnityObject = UnityEngine.Object;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class CheckCompressedFiles : ITestScript
+    {
+        private enum ArchiveResult
+        {
+            Allowed,
+            NotAllowed,
+            TarGzWithIssues,
+            ZipWithIssues
+        }
+
+        private GenericTestConfig _config;
+        private IAssetUtilityService _assetUtility;
+        private IFileSignatureUtilityService _fileSignatureUtility;
+
+        public CheckCompressedFiles(GenericTestConfig config, IAssetUtilityService assetUtility, IFileSignatureUtilityService fileSignatureUtility)
+        {
+            _config = config;
+            _assetUtility = assetUtility;
+            _fileSignatureUtility = fileSignatureUtility;
+        }
+
+        public TestResult Run()
+        {
+            var result = new TestResult() { Status = TestResultStatus.Undefined };
+
+            var checkedArchives = new Dictionary<UnityObject, ArchiveResult>();
+
+            // Retrieving assets via GetObjectsFromAssets() is insufficient because
+            // archives might be renamed and not use the expected extension
+            var allAssetPaths = _assetUtility.GetAssetPathsFromAssets(_config.ValidationPaths, AssetType.All);
+
+            foreach (var assetPath in allAssetPaths)
+            {
+                ArchiveType archiveType;
+                if ((archiveType = _fileSignatureUtility.GetArchiveType(assetPath)) == ArchiveType.None)
+                    continue;
+
+                var archiveObj = _assetUtility.AssetPathToObject(assetPath);
+
+                switch (archiveType)
+                {
+                    case ArchiveType.TarGz:
+                        if (assetPath.ToLower().EndsWith(".unitypackage"))
+                            checkedArchives.Add(archiveObj, ArchiveResult.Allowed);
+                        else
+                            checkedArchives.Add(archiveObj, ArchiveResult.TarGzWithIssues);
+                        break;
+                    case ArchiveType.Zip:
+                        if (FileNameContainsKeyword(assetPath, "source") && assetPath.ToLower().EndsWith(".zip"))
+                            checkedArchives.Add(archiveObj, ArchiveResult.Allowed);
+                        else
+                            checkedArchives.Add(archiveObj, ArchiveResult.ZipWithIssues);
+                        break;
+                    default:
+                        checkedArchives.Add(archiveObj, ArchiveResult.NotAllowed);
+                        break;
+                }
+            }
+
+            if (checkedArchives.Count == 0)
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("No archives were found in the package content!");
+                return result;
+            }
+
+            if (checkedArchives.Any(x => x.Value == ArchiveResult.Allowed))
+            {
+                result.Status = TestResultStatus.Warning;
+                result.AddMessage("The following archives of allowed format were found in the package content.\n" +
+                    "Please make sure they adhere to the nested archive guidelines:", null,
+                    checkedArchives.Where(x => x.Value == ArchiveResult.Allowed).Select(x => x.Key).ToArray());
+            }
+
+            if (checkedArchives.Any(x => x.Value == ArchiveResult.TarGzWithIssues))
+            {
+                result.Status = TestResultStatus.VariableSeverityIssue;
+                result.AddMessage("The following .gz archives were found in the package content.\n" +
+                    "� Gz archives are only allowed in form of '.unitypackage' files", null,
+                    checkedArchives.Where(x => x.Value == ArchiveResult.TarGzWithIssues).Select(x => x.Key).ToArray());
+            }
+
+            if (checkedArchives.Any(x => x.Value == ArchiveResult.ZipWithIssues))
+            {
+                result.Status = TestResultStatus.VariableSeverityIssue;
+                result.AddMessage("The following .zip archives were found in the package content.\n" +
+                    "� Zip archives should contain the keyword 'source' in the file name", null,
+                    checkedArchives.Where(x => x.Value == ArchiveResult.ZipWithIssues).Select(x => x.Key).ToArray());
+            }
+
+            if (checkedArchives.Any(x => x.Value == ArchiveResult.NotAllowed))
+            {
+                result.Status = TestResultStatus.VariableSeverityIssue;
+                result.AddMessage("The following archives are using formats that are not allowed:", null,
+                    checkedArchives.Where(x => x.Value == ArchiveResult.NotAllowed).Select(x => x.Key).ToArray());
+            }
+
+            return result;
+        }
+
+        private bool FileNameContainsKeyword(string filePath, string keyword)
+        {
+            var fileInfo = new FileInfo(filePath);
+
+            if (!fileInfo.Exists)
+                return false;
+
+            return fileInfo.Name.Remove(fileInfo.Name.Length - fileInfo.Extension.Length).ToLower().Contains(keyword.ToLower());
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckCompressedFiles.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckCompressedFiles.cs.meta
new file mode 100644
index 0000000..b9c85a6
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckCompressedFiles.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 84b23febe0d923842aef73b95da5f25b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckCompressedFiles.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckEmptyPrefabs.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckEmptyPrefabs.cs
new file mode 100644
index 0000000..e12234c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckEmptyPrefabs.cs	
@@ -0,0 +1,46 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services.Validation;
+using AssetStoreTools.Validator.TestDefinitions;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class CheckEmptyPrefabs : ITestScript
+    {
+        private GenericTestConfig _config;
+        private IAssetUtilityService _assetUtility;
+
+        public CheckEmptyPrefabs(GenericTestConfig config, IAssetUtilityService assetUtility)
+        {
+            _config = config;
+            _assetUtility = assetUtility;
+        }
+
+        public TestResult Run()
+        {
+            var result = new TestResult() { Status = TestResultStatus.Undefined };
+
+            var prefabs = _assetUtility.GetObjectsFromAssets<GameObject>(_config.ValidationPaths, AssetType.Prefab);
+            var badPrefabs = new List<GameObject>();
+
+            foreach (var p in prefabs)
+            {
+                if (p.GetComponents<Component>().Length == 1 && p.transform.childCount == 0)
+                    badPrefabs.Add(p);
+            }
+
+            if (badPrefabs.Count == 0)
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("No empty prefabs were found!");
+                return result;
+            }
+
+            result.Status = TestResultStatus.VariableSeverityIssue;
+            result.AddMessage("The following prefabs are empty", null, badPrefabs.ToArray());
+
+            return result;
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckEmptyPrefabs.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckEmptyPrefabs.cs.meta
new file mode 100644
index 0000000..3ada9d5
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckEmptyPrefabs.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 8055bed9373283e4793463b90b42f08f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckEmptyPrefabs.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckFileMenuNames.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckFileMenuNames.cs
new file mode 100644
index 0000000..940cc38
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckFileMenuNames.cs	
@@ -0,0 +1,153 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services.Validation;
+using AssetStoreTools.Validator.TestDefinitions;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using UnityEditor;
+using UnityObject = UnityEngine.Object;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class CheckFileMenuNames : ITestScript
+    {
+        private GenericTestConfig _config;
+        private IAssetUtilityService _assetUtility;
+        private IScriptUtilityService _scriptUtility;
+
+        public CheckFileMenuNames(GenericTestConfig config, IAssetUtilityService assetUtility, IScriptUtilityService scriptUtility)
+        {
+            _config = config;
+            _assetUtility = assetUtility;
+            _scriptUtility = scriptUtility;
+        }
+
+        public TestResult Run()
+        {
+            var result = new TestResult() { Status = TestResultStatus.Undefined };
+
+            var bindingFlags = BindingFlags.Public | BindingFlags.NonPublic |
+                BindingFlags.Instance | BindingFlags.Static | BindingFlags.DeclaredOnly;
+
+            #region Scripts
+
+            var scripts = _assetUtility.GetObjectsFromAssets<MonoScript>(_config.ValidationPaths, AssetType.MonoScript).ToArray();
+            var scriptTypes = _scriptUtility.GetTypesFromScriptAssets(scripts);
+            var affectedScripts = new Dictionary<MonoScript, List<string>>();
+
+            foreach (var kvp in scriptTypes)
+            {
+                var badMethods = new List<string>();
+                foreach (var type in kvp.Value)
+                {
+                    foreach (var method in type.GetMethods(bindingFlags))
+                    {
+                        var attributes = method.GetCustomAttributes<MenuItem>().ToList();
+                        if (attributes.Count == 0)
+                            continue;
+
+                        var badAttributes = attributes.Where(x => !IsValidMenuItem(x.menuItem)).ToList();
+                        if (badAttributes.Count > 0)
+                            badMethods.Add($"{string.Join("\n", badAttributes.Select(x => $"\'{x.menuItem}\'"))}\n(for method '{method.Name}')\n");
+                    }
+                }
+
+                if (badMethods.Count > 0)
+                    affectedScripts.Add(kvp.Key, badMethods);
+            }
+
+            #endregion
+
+            #region Precompiled Assemblies
+
+            var assemblies = _assetUtility.GetObjectsFromAssets(_config.ValidationPaths, AssetType.PrecompiledAssembly).ToArray();
+            var assemblyTypes = _scriptUtility.GetTypesFromAssemblies(assemblies);
+            var affectedAssemblies = new Dictionary<UnityObject, List<string>>();
+
+            foreach (var kvp in assemblyTypes)
+            {
+                var badMethods = new List<string>();
+                foreach (var type in kvp.Value)
+                {
+                    foreach (var method in type.GetMethods(bindingFlags))
+                    {
+                        var attributes = method.GetCustomAttributes<MenuItem>().ToList();
+                        if (attributes.Count == 0)
+                            continue;
+
+                        var badAttributes = attributes.Where(x => !IsValidMenuItem(x.menuItem)).ToList();
+                        if (badAttributes.Count > 0)
+                            badMethods.Add($"{string.Join("\n", badAttributes.Select(x => (x as MenuItem).menuItem))}\n(Method '{method.Name}')\n");
+                    }
+                }
+
+                if (badMethods.Count > 0)
+                    affectedAssemblies.Add(kvp.Key, badMethods);
+            }
+
+            #endregion
+
+            if (affectedScripts.Count > 0 || affectedAssemblies.Count > 0)
+            {
+                if (affectedScripts.Count > 0)
+                {
+                    result.Status = TestResultStatus.VariableSeverityIssue;
+                    result.AddMessage("The following scripts contain invalid MenuItem names:");
+                    foreach (var kvp in affectedScripts)
+                    {
+                        var message = string.Empty;
+                        foreach (var type in kvp.Value)
+                            message += type + "\n";
+
+                        message = message.Remove(message.Length - "\n".Length);
+                        result.AddMessage(message, null, kvp.Key);
+                    }
+                }
+
+                if (affectedAssemblies.Count > 0)
+                {
+                    result.Status = TestResultStatus.VariableSeverityIssue;
+                    result.AddMessage("The following assemblies contain invalid MenuItem names:");
+                    foreach (var kvp in affectedAssemblies)
+                    {
+                        var message = string.Empty;
+                        foreach (var type in kvp.Value)
+                            message += type + "\n";
+
+                        message = message.Remove(message.Length - "\n".Length);
+                        result.AddMessage(message, null, kvp.Key);
+                    }
+                }
+            }
+            else
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("No MenuItems with invalid names were found!");
+            }
+
+            return result;
+        }
+
+        private bool IsValidMenuItem(string menuItemName)
+        {
+            var acceptableMenuItems = new string[]
+            {
+                "File",
+                "Edit",
+                "Assets",
+                "GameObject",
+                "Component",
+                "Window",
+                "Help",
+                "CONTEXT",
+                "Tools"
+            };
+
+            menuItemName = menuItemName.Replace("\\", "/");
+            if (acceptableMenuItems.Any(x => menuItemName.ToLower().StartsWith($"{x.ToLower()}/")))
+                return true;
+
+            return false;
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckFileMenuNames.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckFileMenuNames.cs.meta
new file mode 100644
index 0000000..2e59450
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckFileMenuNames.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: d8e3b12ecc1fcd74d9a9f8d2b549fc63
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckFileMenuNames.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckLODs.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckLODs.cs
new file mode 100644
index 0000000..4beec16
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckLODs.cs	
@@ -0,0 +1,79 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Data.MessageActions;
+using AssetStoreTools.Validator.Services.Validation;
+using AssetStoreTools.Validator.TestDefinitions;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class CheckLODs : ITestScript
+    {
+        private GenericTestConfig _config;
+        private IAssetUtilityService _assetUtility;
+
+        public CheckLODs(GenericTestConfig config, IAssetUtilityService assetUtility)
+        {
+            _config = config;
+            _assetUtility = assetUtility;
+        }
+
+        public TestResult Run()
+        {
+            var result = new TestResult() { Status = TestResultStatus.Undefined };
+
+            var prefabs = _assetUtility.GetObjectsFromAssets<GameObject>(_config.ValidationPaths, AssetType.Prefab);
+            var badPrefabs = new Dictionary<GameObject, List<MeshFilter>>();
+
+            foreach (var p in prefabs)
+            {
+                var meshFilters = p.GetComponentsInChildren<MeshFilter>(true);
+                var badMeshFilters = new List<MeshFilter>();
+                var lodGroups = p.GetComponentsInChildren<LODGroup>(true);
+
+                foreach (var mf in meshFilters)
+                {
+                    if (mf.name.Contains("LOD") && !IsPartOfLodGroup(mf, lodGroups))
+                        badMeshFilters.Add(mf);
+                }
+
+                if (badMeshFilters.Count > 0)
+                    badPrefabs.Add(p, badMeshFilters);
+            }
+
+            if (badPrefabs.Count == 0)
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("All found prefabs are meeting the LOD requirements!");
+                return result;
+            }
+
+            result.Status = TestResultStatus.VariableSeverityIssue;
+            result.AddMessage("The following prefabs do not meet the LOD requirements");
+
+            foreach (var p in badPrefabs)
+            {
+                var resultList = new List<Object>();
+                resultList.Add(p.Key);
+                resultList.AddRange(p.Value);
+                result.AddMessage($"{p.Key.name}.prefab", new OpenAssetAction(p.Key), resultList.ToArray());
+            }
+
+            return result;
+        }
+
+        private bool IsPartOfLodGroup(MeshFilter mf, LODGroup[] lodGroups)
+        {
+            foreach (var lodGroup in lodGroups)
+            {
+                // If MeshFilter is a child/deep child of a LodGroup AND is referenced in this LOD group - it is valid
+                if (mf.transform.IsChildOf(lodGroup.transform) &&
+                    lodGroup.GetLODs().Any(lod => lod.renderers.Any(renderer => renderer != null && renderer.gameObject == mf.gameObject)))
+                    return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckLODs.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckLODs.cs.meta
new file mode 100644
index 0000000..e860a67
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckLODs.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 43b2158602f87704fa7b91561cfc8678
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckLODs.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckLineEndings.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckLineEndings.cs
new file mode 100644
index 0000000..3bb574e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckLineEndings.cs	
@@ -0,0 +1,77 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services.Validation;
+using AssetStoreTools.Validator.TestDefinitions;
+using System;
+using System.Collections.Concurrent;
+using System.Threading.Tasks;
+using UnityEditor;
+using UnityObject = UnityEngine.Object;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class CheckLineEndings : ITestScript
+    {
+        private GenericTestConfig _config;
+        private IAssetUtilityService _assetUtility;
+
+        public CheckLineEndings(GenericTestConfig config, IAssetUtilityService assetUtility)
+        {
+            _config = config;
+            _assetUtility = assetUtility;
+        }
+
+        public TestResult Run()
+        {
+            var result = new TestResult() { Status = TestResultStatus.Undefined };
+
+            var scripts = _assetUtility.GetObjectsFromAssets<MonoScript>(_config.ValidationPaths, AssetType.MonoScript);
+
+            var affectedScripts = new ConcurrentBag<UnityObject>();
+            var scriptContents = new ConcurrentDictionary<MonoScript, string>();
+
+            // A separate dictionary is needed because MonoScript contents cannot be accessed outside of the main thread
+            foreach (var s in scripts)
+                if (s != null)
+                    scriptContents.TryAdd(s, s.text);
+
+            Parallel.ForEach(scriptContents, (s) =>
+            {
+                if (HasInconsistentLineEndings(s.Value))
+                    affectedScripts.Add(s.Key);
+            });
+
+            if (affectedScripts.Count > 0)
+            {
+                result.Status = TestResultStatus.VariableSeverityIssue;
+                result.AddMessage("The following scripts have inconsistent line endings:", null, affectedScripts.ToArray());
+            }
+            else
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("No scripts with inconsistent line endings were found!");
+            }
+
+            return result;
+        }
+
+        private bool HasInconsistentLineEndings(string text)
+        {
+            int crlfEndings = 0;
+            int lfEndings = 0;
+
+            var split = text.Split(new[] { "\n" }, StringSplitOptions.None);
+            for (int i = 0; i < split.Length; i++)
+            {
+                var line = split[i];
+                if (line.EndsWith("\r"))
+                    crlfEndings++;
+                else if (i != split.Length - 1)
+                    lfEndings++;
+            }
+
+            if (crlfEndings > 0 && lfEndings > 0)
+                return true;
+            return false;
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckLineEndings.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckLineEndings.cs.meta
new file mode 100644
index 0000000..13dc5ad
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckLineEndings.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 85885005d1c594f42826de3555e98365
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckLineEndings.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckMeshPrefabs.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckMeshPrefabs.cs
new file mode 100644
index 0000000..6b92c9a
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckMeshPrefabs.cs	
@@ -0,0 +1,106 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services.Validation;
+using AssetStoreTools.Validator.TestDefinitions;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class CheckMeshPrefabs : ITestScript
+    {
+        private GenericTestConfig _config;
+        private IAssetUtilityService _assetUtility;
+        private IMeshUtilityService _meshUtility;
+
+        public CheckMeshPrefabs(GenericTestConfig config, IAssetUtilityService assetUtility, IMeshUtilityService meshUtility)
+        {
+            _config = config;
+            _assetUtility = assetUtility;
+            _meshUtility = meshUtility;
+        }
+
+        public TestResult Run()
+        {
+            var result = new TestResult() { Status = TestResultStatus.Undefined };
+
+            var usedModelPaths = new List<string>();
+            var prefabs = _assetUtility.GetObjectsFromAssets<GameObject>(_config.ValidationPaths, AssetType.Prefab);
+            var missingMeshReferencePrefabs = new List<GameObject>();
+
+            // Get all meshes in existing prefabs and check if prefab has missing mesh references
+            foreach (var p in prefabs)
+            {
+                var meshes = _meshUtility.GetCustomMeshesInObject(p);
+                foreach (var mesh in meshes)
+                {
+                    string meshPath = _assetUtility.ObjectToAssetPath(mesh);
+                    usedModelPaths.Add(meshPath);
+                }
+
+                if (HasMissingMeshReferences(p))
+                    missingMeshReferencePrefabs.Add(p);
+            }
+
+            // Get all meshes in existing models
+            var allModelPaths = GetAllModelMeshPaths(_config.ValidationPaths);
+
+            // Get the list of meshes without prefabs
+            List<string> unusedModels = allModelPaths.Except(usedModelPaths).ToList();
+
+            if (unusedModels.Count == 0)
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("All found prefabs have meshes!");
+                return result;
+            }
+
+            result.Status = TestResultStatus.VariableSeverityIssue;
+            var models = unusedModels.Select(_assetUtility.AssetPathToObject).ToArray();
+            result.AddMessage("The following models do not have associated prefabs", null, models);
+
+            if (missingMeshReferencePrefabs.Count > 0)
+                result.AddMessage("The following prefabs have missing mesh references", null, missingMeshReferencePrefabs.ToArray());
+
+            return result;
+        }
+
+        private IEnumerable<string> GetAllModelMeshPaths(string[] validationPaths)
+        {
+            var models = _assetUtility.GetObjectsFromAssets(validationPaths, AssetType.Model);
+            var paths = new List<string>();
+
+            foreach (var o in models)
+            {
+                var m = (GameObject)o;
+                var modelPath = _assetUtility.ObjectToAssetPath(m);
+                var assetImporter = _assetUtility.GetAssetImporter(modelPath);
+                if (assetImporter is UnityEditor.ModelImporter modelImporter)
+                {
+                    var clips = modelImporter.clipAnimations.Count();
+                    var meshes = _meshUtility.GetCustomMeshesInObject(m);
+
+                    // Only add if the model has meshes and no clips
+                    if (meshes.Any() && clips == 0)
+                        paths.Add(modelPath);
+                }
+            }
+
+            return paths;
+        }
+
+        private bool HasMissingMeshReferences(GameObject go)
+        {
+            var meshes = go.GetComponentsInChildren<MeshFilter>(true);
+            var skinnedMeshes = go.GetComponentsInChildren<SkinnedMeshRenderer>(true);
+
+            if (meshes.Length == 0 && skinnedMeshes.Length == 0)
+                return false;
+
+            if (meshes.Any(x => x.sharedMesh == null) || skinnedMeshes.Any(x => x.sharedMesh == null))
+                return true;
+
+            return false;
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckMeshPrefabs.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckMeshPrefabs.cs.meta
new file mode 100644
index 0000000..ee337cf
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckMeshPrefabs.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 3c3d0d642ac6a6a48aa124a93dae3734
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckMeshPrefabs.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckMissingComponentsinAssets.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckMissingComponentsinAssets.cs
new file mode 100644
index 0000000..6d4b013
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckMissingComponentsinAssets.cs	
@@ -0,0 +1,66 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services.Validation;
+using AssetStoreTools.Validator.TestDefinitions;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class CheckMissingComponentsinAssets : ITestScript
+    {
+        private GenericTestConfig _config;
+        private IAssetUtilityService _assetUtility;
+
+        public CheckMissingComponentsinAssets(GenericTestConfig config, IAssetUtilityService assetUtility)
+        {
+            _config = config;
+            _assetUtility = assetUtility;
+        }
+
+        public TestResult Run()
+        {
+            var result = new TestResult() { Status = TestResultStatus.Undefined };
+
+            var assets = GetAllAssetsWithMissingComponents(_config.ValidationPaths);
+
+            if (assets.Length == 0)
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("No assets have missing components!");
+                return result;
+            }
+
+            result.Status = TestResultStatus.VariableSeverityIssue;
+            result.AddMessage("The following assets contain missing components", null, assets);
+
+            return result;
+        }
+
+        private GameObject[] GetAllAssetsWithMissingComponents(string[] validationPaths)
+        {
+            var missingReferenceAssets = new List<GameObject>();
+            var prefabObjects = _assetUtility.GetObjectsFromAssets<GameObject>(validationPaths, AssetType.Prefab);
+
+            foreach (var p in prefabObjects)
+            {
+                if (p != null && IsMissingReference(p))
+                    missingReferenceAssets.Add(p);
+            }
+
+            return missingReferenceAssets.ToArray();
+        }
+
+        private bool IsMissingReference(GameObject asset)
+        {
+            var components = asset.GetComponentsInChildren<Component>();
+
+            foreach (var c in components)
+            {
+                if (!c)
+                    return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckMissingComponentsinAssets.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckMissingComponentsinAssets.cs.meta
new file mode 100644
index 0000000..965a215
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckMissingComponentsinAssets.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 22d8f814e2363e34ea220736a4042728
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckMissingComponentsinAssets.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckMissingComponentsinScenes.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckMissingComponentsinScenes.cs
new file mode 100644
index 0000000..87ef34b
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckMissingComponentsinScenes.cs	
@@ -0,0 +1,93 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Data.MessageActions;
+using AssetStoreTools.Validator.Services.Validation;
+using AssetStoreTools.Validator.TestDefinitions;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+using SceneAsset = UnityEditor.SceneAsset;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class CheckMissingComponentsinScenes : ITestScript
+    {
+        private GenericTestConfig _config;
+        private IAssetUtilityService _assetUtility;
+        private ISceneUtilityService _sceneUtility;
+
+        public CheckMissingComponentsinScenes(GenericTestConfig config, IAssetUtilityService assetUtility, ISceneUtilityService sceneUtility)
+        {
+            _config = config;
+            _assetUtility = assetUtility;
+            _sceneUtility = sceneUtility;
+        }
+
+        public TestResult Run()
+        {
+            var result = new TestResult() { Status = TestResultStatus.Undefined };
+
+            var originalScenePath = _sceneUtility.CurrentScenePath;
+
+            var scenePaths = _assetUtility.GetAssetPathsFromAssets(_config.ValidationPaths, AssetType.Scene);
+            foreach (var scenePath in scenePaths)
+            {
+                var missingComponentGOs = GetMissingComponentGOsInScene(scenePath);
+
+                if (missingComponentGOs.Count == 0)
+                    continue;
+
+                result.Status = TestResultStatus.VariableSeverityIssue;
+                var message = $"GameObjects with missing components or prefab references found in {scenePath}.\n\nClick this message to open the Scene and see the affected GameObjects:";
+                result.AddMessage(message, new OpenAssetAction(_assetUtility.AssetPathToObject<SceneAsset>(scenePath)), missingComponentGOs.ToArray());
+            }
+
+            _sceneUtility.OpenScene(originalScenePath);
+
+            if (result.Status == TestResultStatus.Undefined)
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("No missing components were found!");
+            }
+
+            return result;
+        }
+
+        private List<GameObject> GetMissingComponentGOsInScene(string path)
+        {
+            var missingComponentGOs = new List<GameObject>();
+
+            var scene = _sceneUtility.OpenScene(path);
+
+            if (!scene.IsValid())
+            {
+                Debug.LogWarning("Unable to get Scene in " + path);
+                return new List<GameObject>();
+            }
+
+            var rootObjects = scene.GetRootGameObjects();
+
+            foreach (var obj in rootObjects)
+            {
+                missingComponentGOs.AddRange(GetMissingComponentGOs(obj));
+            }
+
+            return missingComponentGOs;
+        }
+
+        private List<GameObject> GetMissingComponentGOs(GameObject root)
+        {
+            var missingComponentGOs = new List<GameObject>();
+            var rootComponents = root.GetComponents<Component>();
+
+            if (UnityEditor.PrefabUtility.GetPrefabInstanceStatus(root) == UnityEditor.PrefabInstanceStatus.MissingAsset || rootComponents.Any(c => !c))
+            {
+                missingComponentGOs.Add(root);
+            }
+
+            foreach (Transform child in root.transform)
+                missingComponentGOs.AddRange(GetMissingComponentGOs(child.gameObject));
+
+            return missingComponentGOs;
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckMissingComponentsinScenes.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckMissingComponentsinScenes.cs.meta
new file mode 100644
index 0000000..93b8efb
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckMissingComponentsinScenes.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 511e76d0ebcb23d40a7b49dda0e2980f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckMissingComponentsinScenes.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckModelImportLogs.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckModelImportLogs.cs
new file mode 100644
index 0000000..59519cb
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckModelImportLogs.cs	
@@ -0,0 +1,64 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services.Validation;
+using AssetStoreTools.Validator.TestDefinitions;
+using System.Collections.Generic;
+using System.Linq;
+using UnityObject = UnityEngine.Object;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class CheckModelImportLogs : ITestScript
+    {
+        private GenericTestConfig _config;
+        private IAssetUtilityService _assetUtility;
+        private IModelUtilityService _modelUtility;
+
+        public CheckModelImportLogs(GenericTestConfig config, IAssetUtilityService assetUtility, IModelUtilityService modelUtility)
+        {
+            _config = config;
+            _assetUtility = assetUtility;
+            _modelUtility = modelUtility;
+        }
+
+        public TestResult Run()
+        {
+            var result = new TestResult() { Status = TestResultStatus.Undefined };
+
+            var models = _assetUtility.GetObjectsFromAssets<UnityObject>(_config.ValidationPaths, AssetType.Model);
+            var importLogs = _modelUtility.GetImportLogs(models.ToArray());
+
+            var warningModels = new List<UnityObject>();
+            var errorModels = new List<UnityObject>();
+
+            foreach (var kvp in importLogs)
+            {
+                if (kvp.Value.Any(x => x.Severity == UnityEngine.LogType.Error))
+                    errorModels.Add(kvp.Key);
+                if (kvp.Value.Any(x => x.Severity == UnityEngine.LogType.Warning))
+                    warningModels.Add(kvp.Key);
+            }
+
+            if (warningModels.Count > 0 || errorModels.Count > 0)
+            {
+                if (warningModels.Count > 0)
+                {
+                    result.Status = TestResultStatus.Warning;
+                    result.AddMessage("The following models contain import warnings:", null, warningModels.ToArray());
+                }
+
+                if (errorModels.Count > 0)
+                {
+                    result.Status = TestResultStatus.Warning;
+                    result.AddMessage("The following models contain import errors:", null, errorModels.ToArray());
+                }
+            }
+            else
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("No issues were detected when importing your models!");
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckModelImportLogs.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckModelImportLogs.cs.meta
new file mode 100644
index 0000000..a12e395
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckModelImportLogs.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 98f3ec209166855408eaf4abe5bff591
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckModelImportLogs.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckModelOrientation.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckModelOrientation.cs
new file mode 100644
index 0000000..cf871c5
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckModelOrientation.cs	
@@ -0,0 +1,71 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services.Validation;
+using AssetStoreTools.Validator.TestDefinitions;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class CheckModelOrientation : ITestScript
+    {
+        private GenericTestConfig _config;
+        private IAssetUtilityService _assetUtility;
+        private IMeshUtilityService _meshUtility;
+
+        public CheckModelOrientation(GenericTestConfig config, IAssetUtilityService assetUtility, IMeshUtilityService meshUtility)
+        {
+            _config = config;
+            _assetUtility = assetUtility;
+            _meshUtility = meshUtility;
+        }
+
+        public TestResult Run()
+        {
+            var result = new TestResult() { Status = TestResultStatus.Undefined };
+
+            var models = _assetUtility.GetObjectsFromAssets<GameObject>(_config.ValidationPaths, AssetType.Model);
+            var badModels = new List<GameObject>();
+
+            foreach (var m in models)
+            {
+                var meshes = _meshUtility.GetCustomMeshesInObject(m);
+                var assetImporter = _assetUtility.GetAssetImporter(m);
+
+                if (!(assetImporter is UnityEditor.ModelImporter modelImporter))
+                    continue;
+
+                var clips = modelImporter.clipAnimations.Length;
+
+                // Only check if the model has meshes and no clips
+                if (!meshes.Any() || clips != 0)
+                    continue;
+
+                Transform[] transforms = m.GetComponentsInChildren<Transform>(true);
+
+                foreach (var t in transforms)
+                {
+                    var hasMeshComponent = t.TryGetComponent<MeshFilter>(out _) || t.TryGetComponent<SkinnedMeshRenderer>(out _);
+
+                    if (t.localRotation == Quaternion.identity || !hasMeshComponent)
+                        continue;
+
+                    badModels.Add(m);
+                    break;
+                }
+            }
+
+            if (badModels.Count == 0)
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("All found models are facing the right way!");
+                return result;
+            }
+
+            result.Status = TestResultStatus.VariableSeverityIssue;
+            result.AddMessage("The following models have incorrect rotation", null, badModels.ToArray());
+
+            return result;
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckModelOrientation.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckModelOrientation.cs.meta
new file mode 100644
index 0000000..27e5a09
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckModelOrientation.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 56cdcdc41a80fbc46b5b2b83ec8d66d7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckModelOrientation.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckModelTypes.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckModelTypes.cs
new file mode 100644
index 0000000..edf90e2
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckModelTypes.cs	
@@ -0,0 +1,58 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services.Validation;
+using AssetStoreTools.Validator.TestDefinitions;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor;
+using UnityObject = UnityEngine.Object;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class CheckModelTypes : ITestScript
+    {
+        private GenericTestConfig _config;
+        private IAssetUtilityService _assetUtility;
+
+        public CheckModelTypes(GenericTestConfig config, IAssetUtilityService assetUtility)
+        {
+            _config = config;
+            _assetUtility = assetUtility;
+        }
+
+        public TestResult Run()
+        {
+            var result = new TestResult() { Status = TestResultStatus.Undefined };
+
+            var allowedExtensions = new string[] { ".fbx", ".dae", ".abc", ".obj" };
+            // Should retrieve All assets and not models here since ADB will not recognize certain
+            // types if appropriate software is not installed (e.g. .blend without Blender)
+            var allAssetPaths = _assetUtility.GetAssetPathsFromAssets(_config.ValidationPaths, AssetType.All);
+            var badModels = new List<UnityObject>();
+
+            foreach (var assetPath in allAssetPaths)
+            {
+                var importer = _assetUtility.GetAssetImporter(assetPath);
+                if (importer == null || !(importer is ModelImporter))
+                    continue;
+
+                if (allowedExtensions.Any(x => importer.assetPath.ToLower().EndsWith(x)))
+                    continue;
+
+                badModels.Add(_assetUtility.AssetPathToObject(assetPath));
+            }
+
+            if (badModels.Count == 0)
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("All models are of allowed formats!");
+            }
+            else
+            {
+                result.Status = TestResultStatus.VariableSeverityIssue;
+                result.AddMessage("The following models are of formats that should not be used for Asset Store packages:", null, badModels.ToArray());
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckModelTypes.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckModelTypes.cs.meta
new file mode 100644
index 0000000..b168b6e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckModelTypes.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 428b1fb838e6f5a469bbfd26ca3fbfd2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckModelTypes.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckNormalMapTextures.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckNormalMapTextures.cs
new file mode 100644
index 0000000..b991eb3
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckNormalMapTextures.cs	
@@ -0,0 +1,94 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services.Validation;
+using AssetStoreTools.Validator.TestDefinitions;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class CheckNormalMapTextures : ITestScript
+    {
+        public const int TextureCacheLimit = 8;
+
+        private GenericTestConfig _config;
+        private IAssetUtilityService _assetUtility;
+
+        public CheckNormalMapTextures(GenericTestConfig config, IAssetUtilityService assetUtility)
+        {
+            _config = config;
+            _assetUtility = assetUtility;
+        }
+
+        public TestResult Run()
+        {
+            var result = new TestResult() { Status = TestResultStatus.Undefined };
+
+            var materials = _assetUtility.GetObjectsFromAssets<Material>(_config.ValidationPaths, AssetType.Material);
+            var badTextures = new List<Texture>();
+            var badPaths = new List<string>();
+
+            foreach (var mat in materials)
+            {
+                for (int i = 0; i < mat.shader.GetPropertyCount(); i++)
+                {
+                    if ((mat.shader.GetPropertyFlags(i) & UnityEngine.Rendering.ShaderPropertyFlags.Normal) != 0)
+                    {
+                        var propertyName = mat.shader.GetPropertyName(i);
+                        var assignedTexture = mat.GetTexture(propertyName);
+
+                        if (assignedTexture == null)
+                            continue;
+
+                        var texturePath = _assetUtility.ObjectToAssetPath(assignedTexture);
+                        var textureImporter = _assetUtility.GetAssetImporter(texturePath) as TextureImporter;
+                        if (textureImporter == null)
+                            continue;
+
+                        if (textureImporter.textureType != TextureImporterType.NormalMap && !badTextures.Contains(assignedTexture))
+                        {
+                            if (badTextures.Count < TextureCacheLimit)
+                            {
+                                badTextures.Add(assignedTexture);
+                            }
+                            else
+                            {
+                                string path = AssetDatabase.GetAssetPath(assignedTexture);
+                                badPaths.Add(path);
+                            }
+                        }
+                    }
+                }
+
+                EditorUtility.UnloadUnusedAssetsImmediate();
+            }
+
+            if (badTextures.Count == 0)
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("All normal map textures have the correct texture type!");
+            }
+            else if (badPaths.Count != 0)
+            {
+                foreach (Texture texture in badTextures)
+                {
+                    string path = AssetDatabase.GetAssetPath(texture);
+                    badPaths.Add(path);
+                }
+
+                string paths = string.Join("\n", badPaths);
+
+                result.Status = TestResultStatus.VariableSeverityIssue;
+                result.AddMessage("The following textures are not set to type 'Normal Map'", null);
+                result.AddMessage(paths);
+            }
+            else
+            {
+                result.Status = TestResultStatus.VariableSeverityIssue;
+                result.AddMessage("The following textures are not set to type 'Normal Map'", null, badTextures.ToArray());
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckNormalMapTextures.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckNormalMapTextures.cs.meta
new file mode 100644
index 0000000..8ca6ddb
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckNormalMapTextures.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: d55cea510248f814eb2194c2b53f88d2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckNormalMapTextures.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckPackageNaming.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckPackageNaming.cs
new file mode 100644
index 0000000..a6c69fd
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckPackageNaming.cs	
@@ -0,0 +1,295 @@
+using AssetStoreTools.Utility;
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services.Validation;
+using AssetStoreTools.Validator.TestDefinitions;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class CheckPackageNaming : ITestScript
+    {
+        private const string ForbiddenCharacters = "~`!@#$%^&*()-_=+[{]}\\|;:'\",<>?/";
+        private readonly string[] PathsToCheckForForbiddenCharacters = new string[]
+        {
+            "Assets/",
+            "Assets/Editor/",
+            "Assets/Plugins/",
+            "Assets/Resources/",
+            "Assets/StreamingAssets/",
+            "Assets/WebGLTemplates/"
+        };
+
+        private class PathCheckResult
+        {
+            public Object[] InvalidMainPaths;
+            public Object[] InvalidMainPathContentPaths;
+            public Object[] InvalidMainPathLeadingUpPaths;
+            public Object[] InvalidHybridPackages;
+            public Object[] PotentiallyInvalidContent;
+
+            public bool HasIssues => InvalidMainPaths.Length > 0
+                || InvalidMainPathContentPaths.Length > 0
+                || InvalidMainPathLeadingUpPaths.Length > 0
+                || InvalidHybridPackages.Length > 0
+                || PotentiallyInvalidContent.Length > 0;
+        }
+
+        private GenericTestConfig _config;
+        private IAssetUtilityService _assetUtility;
+
+        // Constructor also accepts dependency injection of registered IValidatorService types
+        public CheckPackageNaming(GenericTestConfig config, IAssetUtilityService assetUtility)
+        {
+            _config = config;
+            _assetUtility = assetUtility;
+        }
+
+        public TestResult Run()
+        {
+            var result = new TestResult() { Status = TestResultStatus.Undefined };
+
+            var checkResult = GetInvalidPathsInAssets();
+
+            if (checkResult.HasIssues)
+            {
+                result.Status = TestResultStatus.Warning;
+
+                if (checkResult.InvalidMainPaths.Length > 0)
+                {
+                    result.Status = TestResultStatus.VariableSeverityIssue;
+                    result.AddMessage("The following assets appear to be artificially bumped up in the project hierarchy within commonly used folders", null, checkResult.InvalidMainPaths);
+                }
+
+                if (checkResult.InvalidMainPathContentPaths.Length > 0)
+                {
+                    result.Status = TestResultStatus.VariableSeverityIssue;
+                    result.AddMessage("The following assets appear to be artificially bumped up in the project hierarchy within commonly used folders", null, checkResult.InvalidMainPathContentPaths);
+                }
+
+                if (checkResult.InvalidMainPathLeadingUpPaths.Length > 0)
+                {
+                    result.Status = TestResultStatus.VariableSeverityIssue;
+                    result.AddMessage("Despite not being directly validated, this path would be automatically created by the Unity Importer when importing your package", null, checkResult.InvalidMainPathLeadingUpPaths);
+                }
+
+                if (checkResult.InvalidHybridPackages.Length > 0)
+                {
+                    result.Status = TestResultStatus.VariableSeverityIssue;
+                    result.AddMessage("The following packages appear to be artificially bumped up in the Package hierarchy with their 'Display Name' configuration", null, checkResult.InvalidHybridPackages);
+                }
+
+                if (checkResult.PotentiallyInvalidContent.Length > 0)
+                {
+                    // Do not override previously set severities
+                    result.AddMessage("It is recommended that nested package content refrains from starting with a special character", null, checkResult.PotentiallyInvalidContent);
+                }
+            }
+            else
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("All package asset names are valid!");
+            }
+
+            return result;
+        }
+
+        private PathCheckResult GetInvalidPathsInAssets()
+        {
+            var allInvalidMainPaths = new List<string>();
+            var allInvalidMainContentPaths = new List<string>();
+            var allInvalidMainLeadingUpPaths = new List<string>();
+            var allInvalidPackagePaths = new List<string>();
+            var allInvalidOtherContentPaths = new List<string>();
+
+            foreach (var validationPath in _config.ValidationPaths)
+            {
+                // Is path itself not forbidden e.g.: when validating Assets/_Package, the folder _Package would be invalid
+                if (!IsDirectMainPathValid(validationPath))
+                    allInvalidMainPaths.Add(validationPath);
+
+                // Are path contents not forbidden e.g.: when validating Assets/, the folder _Package would be invalid
+                if (!IsDirectMainPathContentValid(validationPath, out var invalidContentPaths))
+                    allInvalidMainContentPaths.AddRange(invalidContentPaths);
+
+                // Is the path leading up to this path not forbidden e.g: when validating Assets/_WorkDir/Package, the folder _Workdir would be invalid
+                if (!IsPathLeadingUpToMainPathValid(validationPath, out var invalidLeadingUpPath))
+                    allInvalidMainLeadingUpPaths.Add(invalidLeadingUpPath);
+
+                // Is the path pointing to a package valid, e.g.: when validating Packages/com.company.product its display name _Product would be invalid
+                if (!IsHybridPackageMainPathValid(validationPath, out string invalidPackagePath))
+                    allInvalidPackagePaths.Add(invalidPackagePath);
+            }
+
+            var ignoredPaths = new List<string>();
+            ignoredPaths.AddRange(allInvalidMainPaths);
+            ignoredPaths.AddRange(allInvalidMainContentPaths);
+            ignoredPaths.AddRange(allInvalidMainLeadingUpPaths);
+            ignoredPaths.AddRange(allInvalidPackagePaths);
+
+            // Mark any other paths that start with a forbidden character
+            if (!ArePackageContentsValid(ignoredPaths, out var invalidContents))
+                allInvalidOtherContentPaths.AddRange(invalidContents);
+
+            return new PathCheckResult()
+            {
+                InvalidMainPaths = PathsToObjects(allInvalidMainPaths),
+                InvalidMainPathContentPaths = PathsToObjects(allInvalidMainContentPaths),
+                InvalidMainPathLeadingUpPaths = PathsToObjects(allInvalidMainLeadingUpPaths),
+                InvalidHybridPackages = PathsToObjects(allInvalidPackagePaths),
+                PotentiallyInvalidContent = PathsToObjects(allInvalidOtherContentPaths)
+            };
+        }
+
+        private bool IsDirectMainPathValid(string validationPath)
+        {
+            foreach (var forbiddenPath in PathsToCheckForForbiddenCharacters)
+            {
+                var forbiddenPathWithSeparator = forbiddenPath.EndsWith("/") ? forbiddenPath : forbiddenPath + "/";
+                if (!validationPath.StartsWith(forbiddenPathWithSeparator))
+                    continue;
+
+                var truncatedPath = validationPath.Remove(0, forbiddenPathWithSeparator.Length);
+                var truncatedPathSplit = truncatedPath.Split('/');
+
+                // It is not a direct main path if it has deeper paths
+                if (truncatedPathSplit.Length != 1)
+                    continue;
+
+                if (ForbiddenCharacters.Any(x => truncatedPath.StartsWith(x.ToString())))
+                    return false;
+            }
+
+            return true;
+        }
+
+        private bool IsDirectMainPathContentValid(string validationPath, out List<string> invalidContentPaths)
+        {
+            invalidContentPaths = new List<string>();
+
+            var contents = Directory.EnumerateFileSystemEntries(validationPath, "*", SearchOption.AllDirectories)
+                .Where(x => !x.EndsWith(".meta"))
+                .Select(GetAdbPath);
+
+            foreach (var contentPath in contents)
+            {
+                foreach (var forbiddenPath in PathsToCheckForForbiddenCharacters)
+                {
+                    var forbiddenPathWithSeparator = forbiddenPath.EndsWith("/") ? forbiddenPath : forbiddenPath + "/";
+                    if (!contentPath.StartsWith(forbiddenPathWithSeparator))
+                        continue;
+
+                    var truncatedPath = contentPath.Remove(0, forbiddenPathWithSeparator.Length);
+                    var truncatedPathSplit = truncatedPath.Split('/');
+
+                    // Only check the first level of content relative to the forbidden path
+                    if (truncatedPathSplit.Length > 1)
+                        continue;
+
+                    if (ForbiddenCharacters.Any(x => truncatedPathSplit[0].StartsWith(x.ToString())))
+                        invalidContentPaths.Add(contentPath);
+                }
+            }
+
+            return invalidContentPaths.Count == 0;
+        }
+
+        private bool IsPathLeadingUpToMainPathValid(string validationPath, out string invalidLeadingUpPath)
+        {
+            invalidLeadingUpPath = string.Empty;
+
+            foreach (var forbiddenPath in PathsToCheckForForbiddenCharacters)
+            {
+                var forbiddenPathWithSeparator = forbiddenPath.EndsWith("/") ? forbiddenPath : forbiddenPath + "/";
+                if (!validationPath.StartsWith(forbiddenPathWithSeparator))
+                    continue;
+
+                var truncatedPath = validationPath.Remove(0, forbiddenPathWithSeparator.Length);
+                var truncatedPathSplit = truncatedPath.Split('/');
+
+                // It is not a leading up path if it has no deeper path
+                if (truncatedPathSplit.Length == 1)
+                    continue;
+
+                if (ForbiddenCharacters.Any(x => truncatedPathSplit[0].StartsWith(x.ToString())))
+                {
+                    invalidLeadingUpPath = forbiddenPathWithSeparator + truncatedPathSplit[0];
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private bool IsHybridPackageMainPathValid(string validationPath, out string invalidPackagePath)
+        {
+            invalidPackagePath = string.Empty;
+
+            if (!PackageUtility.GetPackageByManifestPath($"{validationPath}/package.json", out var package))
+                return true;
+
+            var packageName = package.displayName;
+            if (ForbiddenCharacters.Any(x => packageName.StartsWith(x.ToString())))
+            {
+                invalidPackagePath = validationPath;
+                return false;
+            }
+
+            return true;
+        }
+
+        private bool ArePackageContentsValid(IEnumerable<string> ignoredPaths, out List<string> invalidContentPaths)
+        {
+            invalidContentPaths = new List<string>();
+
+            foreach (var validationPath in _config.ValidationPaths)
+            {
+                var validationPathFolderName = validationPath.Split('/').Last();
+                if (!ignoredPaths.Contains(validationPath) && ForbiddenCharacters.Any(x => validationPathFolderName.StartsWith(x.ToString())))
+                    invalidContentPaths.Add(validationPath);
+
+                var contents = Directory.EnumerateFileSystemEntries(validationPath, "*", SearchOption.AllDirectories)
+                    .Where(x => !x.EndsWith(".meta"))
+                    .Select(GetAdbPath);
+
+                foreach (var contentEntry in contents)
+                {
+                    if (ignoredPaths.Contains(contentEntry))
+                        continue;
+
+                    var entryName = contentEntry.Split('/').Last();
+                    if (ForbiddenCharacters.Any(x => entryName.StartsWith(x.ToString())))
+                        invalidContentPaths.Add(contentEntry);
+                }
+            }
+
+            return invalidContentPaths.Count == 0;
+        }
+
+        private string GetAdbPath(string path)
+        {
+            path = path.Replace("\\", "/");
+            if (path.StartsWith(Constants.RootProjectPath))
+                path = path.Remove(Constants.RootProjectPath.Length);
+
+            return path;
+        }
+
+        private Object[] PathsToObjects(IEnumerable<string> paths)
+        {
+            var objects = new List<Object>();
+
+            foreach (var path in paths)
+            {
+                var obj = _assetUtility.AssetPathToObject(path);
+                if (obj != null)
+                    objects.Add(obj);
+            }
+
+            return objects.ToArray();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckPackageNaming.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckPackageNaming.cs.meta
new file mode 100644
index 0000000..6372a66
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckPackageNaming.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: afe9e04825c7d904981a54404b222290
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckPackageNaming.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckParticleSystems.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckParticleSystems.cs
new file mode 100644
index 0000000..03fdecb
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckParticleSystems.cs	
@@ -0,0 +1,76 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Data.MessageActions;
+using AssetStoreTools.Validator.Services.Validation;
+using AssetStoreTools.Validator.TestDefinitions;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class CheckParticleSystems : ITestScript
+    {
+        private GenericTestConfig _config;
+        private IAssetUtilityService _assetUtility;
+        private ISceneUtilityService _sceneUtility;
+
+        public CheckParticleSystems(GenericTestConfig config, IAssetUtilityService assetUtility, ISceneUtilityService sceneUtility)
+        {
+            _config = config;
+            _assetUtility = assetUtility;
+            _sceneUtility = sceneUtility;
+        }
+
+        public TestResult Run()
+        {
+            var result = new TestResult() { Status = TestResultStatus.Undefined };
+
+            var originalScenePath = _sceneUtility.CurrentScenePath;
+
+            var scenePaths = _assetUtility.GetAssetPathsFromAssets(_config.ValidationPaths, AssetType.Scene);
+
+            foreach (var path in scenePaths)
+            {
+                var badParticleSystems = new List<ParticleSystem>();
+
+                var scene = _sceneUtility.OpenScene(path);
+
+                if (!scene.IsValid())
+                {
+                    Debug.LogWarning("Unable to get Scene in " + path);
+                    continue;
+                }
+
+#if UNITY_2023_1_OR_NEWER
+                var particleSystems = GameObject.FindObjectsByType<ParticleSystem>(FindObjectsInactive.Include, FindObjectsSortMode.None);
+#else
+                var particleSystems = GameObject.FindObjectsOfType<ParticleSystem>();
+#endif
+
+                foreach (var ps in particleSystems)
+                {
+                    if (PrefabUtility.IsPartOfAnyPrefab(ps.gameObject))
+                        continue;
+                    badParticleSystems.Add(ps);
+                }
+
+                if (badParticleSystems.Count == 0)
+                    continue;
+
+                result.Status = TestResultStatus.VariableSeverityIssue;
+                var message = $"Particle Systems not belonging to any Prefab were found in {path}.\n\nClick this message to open the Scene and see the affected Particle Systems:";
+                result.AddMessage(message, new OpenAssetAction(AssetDatabase.LoadAssetAtPath<SceneAsset>(path)), badParticleSystems.ToArray());
+            }
+
+            _sceneUtility.OpenScene(originalScenePath);
+
+            if (result.Status == TestResultStatus.Undefined)
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("No Particle Systems without Prefabs were found!");
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckParticleSystems.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckParticleSystems.cs.meta
new file mode 100644
index 0000000..36bce08
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckParticleSystems.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 6a623f7988c75884bb17b169ccd3e993
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckParticleSystems.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckPathLengths.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckPathLengths.cs
new file mode 100644
index 0000000..9ee5cab
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckPathLengths.cs	
@@ -0,0 +1,98 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services.Validation;
+using AssetStoreTools.Validator.TestDefinitions;
+using AssetStoreTools.Validator.Utility;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor;
+using UnityObject = UnityEngine.Object;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class CheckPathLengths : ITestScript
+    {
+        private GenericTestConfig _config;
+        private IAssetUtilityService _assetUtility;
+
+        public CheckPathLengths(GenericTestConfig config, IAssetUtilityService assetUtility)
+        {
+            _config = config;
+            _assetUtility = assetUtility;
+        }
+
+        public TestResult Run()
+        {
+            TestResult result = new TestResult();
+
+            int pathLengthLimit = 140;
+            // Get all project paths and sort by length so that folders always come before files
+            var allPaths = ValidatorUtility.GetProjectPaths(_config.ValidationPaths).OrderBy(x => x.Length);
+
+            var filteredDirs = new Dictionary<string, UnityObject>();
+            var filteredFiles = new Dictionary<string, UnityObject>();
+
+            foreach (var path in allPaths)
+            {
+                // Truncated path examples:
+                // Assets/[Scenes/SampleScene.unity]
+                // Packages/com.example.package/[Editor/EditorScript.cs]
+                var truncatedPath = path;
+                if (path.StartsWith("Assets/"))
+                    truncatedPath = path.Remove(0, "Assets/".Length);
+                else if (path.StartsWith("Packages/"))
+                {
+                    var splitPath = path.Split('/');
+                    truncatedPath = string.Join("/", splitPath.Skip(2));
+                }
+
+                // Skip paths under the character limit
+                if (truncatedPath.Length < pathLengthLimit)
+                    continue;
+
+                // Skip children of already added directories
+                if (filteredDirs.Keys.Any(x => truncatedPath.StartsWith(x)))
+                    continue;
+
+                if (AssetDatabase.IsValidFolder(path))
+                {
+                    filteredDirs.Add(truncatedPath, _assetUtility.AssetPathToObject(path));
+                    continue;
+                }
+
+                if (!filteredFiles.ContainsKey(truncatedPath))
+                    filteredFiles.Add(truncatedPath, _assetUtility.AssetPathToObject(path));
+            }
+
+            if (filteredDirs.Count == 0 && filteredFiles.Count == 0)
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("All package content matches the path limit criteria!");
+                return result;
+            }
+
+            if (filteredDirs.Count > 0)
+            {
+                var maxDirLength = filteredDirs.Keys.Aggregate("", (max, cur) => max.Length > cur.Length ? max : cur);
+                result.Status = TestResultStatus.VariableSeverityIssue;
+                result.AddMessage($"The following folders exceed the path length limit:");
+                foreach (var kvp in filteredDirs)
+                {
+                    result.AddMessage($"Path length: {kvp.Key.Length} characters", null, kvp.Value);
+                }
+            }
+
+            if (filteredFiles.Count > 0)
+            {
+                var maxFileLength = filteredFiles.Keys.Aggregate("", (max, cur) => max.Length > cur.Length ? max : cur);
+                result.Status = TestResultStatus.VariableSeverityIssue;
+                result.AddMessage($"The following files exceed the path length limit:");
+                foreach (var kvp in filteredFiles)
+                {
+                    result.AddMessage($"Path length: {kvp.Key.Length} characters", null, kvp.Value);
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckPathLengths.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckPathLengths.cs.meta
new file mode 100644
index 0000000..8d56a29
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckPathLengths.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: ae379305e9165e84584373a8272c09e7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckPathLengths.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckPrefabTransforms.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckPrefabTransforms.cs
new file mode 100644
index 0000000..5202337
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckPrefabTransforms.cs	
@@ -0,0 +1,71 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services.Validation;
+using AssetStoreTools.Validator.TestDefinitions;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class CheckPrefabTransforms : ITestScript
+    {
+        private GenericTestConfig _config;
+        private IAssetUtilityService _assetUtility;
+        private IMeshUtilityService _meshUtility;
+
+        public CheckPrefabTransforms(GenericTestConfig config, IAssetUtilityService assetUtility, IMeshUtilityService meshUtility)
+        {
+            _config = config;
+            _assetUtility = assetUtility;
+            _meshUtility = meshUtility;
+        }
+
+        public TestResult Run()
+        {
+            var result = new TestResult() { Status = TestResultStatus.Undefined };
+
+            var prefabs = _assetUtility.GetObjectsFromAssets<GameObject>(_config.ValidationPaths, AssetType.Prefab);
+            var badPrefabs = new List<GameObject>();
+            var badPrefabsLowOffset = new List<GameObject>();
+
+            foreach (var p in prefabs)
+            {
+                var hasRectTransform = p.TryGetComponent(out RectTransform _);
+                if (hasRectTransform || !_meshUtility.GetCustomMeshesInObject(p).Any())
+                    continue;
+
+                var positionString = p.transform.position.ToString("F12");
+                var rotationString = p.transform.rotation.eulerAngles.ToString("F12");
+                var localScaleString = p.transform.localScale.ToString("F12");
+
+                var vectorZeroString = Vector3.zero.ToString("F12");
+                var vectorOneString = Vector3.one.ToString("F12");
+
+                if (positionString != vectorZeroString || rotationString != vectorZeroString || localScaleString != vectorOneString)
+                {
+                    if (p.transform.position == Vector3.zero && p.transform.rotation.eulerAngles == Vector3.zero && p.transform.localScale == Vector3.one)
+                        badPrefabsLowOffset.Add(p);
+                    else
+                        badPrefabs.Add(p);
+                }
+            }
+
+            if (badPrefabs.Count == 0 && badPrefabsLowOffset.Count == 0)
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("All found prefabs were reset!");
+                return result;
+            }
+
+            result.Status = TestResultStatus.VariableSeverityIssue;
+            if (badPrefabs.Count > 0)
+                result.AddMessage("The following prefabs' transforms do not fit the requirements", null, badPrefabs.ToArray());
+            if (badPrefabsLowOffset.Count > 0)
+                result.AddMessage("The following prefabs have unusually low transform values, which might not be accurately displayed " +
+                    "in the Inspector window. Please use the 'Debug' Inspector mode to review the Transform component of these prefabs " +
+                    "or reset the Transform components using the right-click context menu", null, badPrefabsLowOffset.ToArray());
+
+            return result;
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckPrefabTransforms.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckPrefabTransforms.cs.meta
new file mode 100644
index 0000000..cbffe1a
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckPrefabTransforms.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: f712c17a60bf2d049a4e61c8f79e56c2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckPrefabTransforms.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckScriptCompilation.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckScriptCompilation.cs
new file mode 100644
index 0000000..e5a0606
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckScriptCompilation.cs	
@@ -0,0 +1,30 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.TestDefinitions;
+using UnityEditor;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class CheckScriptCompilation : ITestScript
+    {
+        public TestResult Run()
+        {
+            var result = new TestResult() { Status = TestResultStatus.Undefined };
+
+            var hasCompilationErrors = EditorUtility.scriptCompilationFailed;
+
+            if (hasCompilationErrors)
+            {
+                result.Status = TestResultStatus.VariableSeverityIssue;
+                result.AddMessage("One or more scripts in the project failed to compile.\n" +
+                    "Please check the Console window to see the list of errors");
+            }
+            else
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("All scripts in the project compiled successfully!");
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckScriptCompilation.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckScriptCompilation.cs.meta
new file mode 100644
index 0000000..f50df8c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckScriptCompilation.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 59db88f43969db8499299bce7f4fb967
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckScriptCompilation.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckShaderCompilation.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckShaderCompilation.cs
new file mode 100644
index 0000000..d6305af
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckShaderCompilation.cs	
@@ -0,0 +1,63 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services.Validation;
+using AssetStoreTools.Validator.TestDefinitions;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+#if !UNITY_2023_1_OR_NEWER
+using UnityEngine.Experimental.Rendering;
+#endif
+#if UNITY_2023_1_OR_NEWER
+using UnityEngine.Rendering;
+#endif
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class CheckShaderCompilation : ITestScript
+    {
+        private GenericTestConfig _config;
+        private IAssetUtilityService _assetUtility;
+
+        public CheckShaderCompilation(GenericTestConfig config, IAssetUtilityService assetUtility)
+        {
+            _config = config;
+            _assetUtility = assetUtility;
+        }
+
+        public TestResult Run()
+        {
+            var result = new TestResult() { Status = TestResultStatus.Undefined };
+
+            var shaders = _assetUtility.GetObjectsFromAssets(_config.ValidationPaths, AssetType.Shader);
+            var badShaders = shaders.Where(ShaderHasError).ToArray();
+
+            if (badShaders.Length > 0)
+            {
+                result.Status = TestResultStatus.VariableSeverityIssue;
+                result.AddMessage("The following shader files have errors", null, badShaders);
+            }
+            else
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("All found Shaders have no compilation errors!");
+            }
+
+            return result;
+        }
+
+        private bool ShaderHasError(Object obj)
+        {
+            switch (obj)
+            {
+                case Shader shader:
+                    return ShaderUtil.ShaderHasError(shader);
+                case ComputeShader shader:
+                    return ShaderUtil.GetComputeShaderMessageCount(shader) > 0;
+                case RayTracingShader shader:
+                    return ShaderUtil.GetRayTracingShaderMessageCount(shader) > 0;
+                default:
+                    return false;
+            }
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckShaderCompilation.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckShaderCompilation.cs.meta
new file mode 100644
index 0000000..6bd1d2c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckShaderCompilation.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 7abb278a6082bde4391e0779394cb85b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckShaderCompilation.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckTextureDimensions.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckTextureDimensions.cs
new file mode 100644
index 0000000..fbe52dc
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckTextureDimensions.cs	
@@ -0,0 +1,57 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services.Validation;
+using AssetStoreTools.Validator.TestDefinitions;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class CheckTextureDimensions : ITestScript
+    {
+        private GenericTestConfig _config;
+        private IAssetUtilityService _assetUtility;
+
+        public CheckTextureDimensions(GenericTestConfig config, IAssetUtilityService assetUtility)
+        {
+            _config = config;
+            _assetUtility = assetUtility;
+        }
+
+        public TestResult Run()
+        {
+            var result = new TestResult() { Status = TestResultStatus.Undefined };
+
+            var textures = _assetUtility.GetObjectsFromAssets<Texture>(_config.ValidationPaths, AssetType.Texture);
+            var badTextures = new List<Texture>();
+
+            foreach (var texture in textures)
+            {
+                if (Mathf.IsPowerOfTwo(texture.width) && Mathf.IsPowerOfTwo(texture.height))
+                    continue;
+
+                var importer = _assetUtility.GetAssetImporter(_assetUtility.ObjectToAssetPath(texture));
+
+                if (importer == null || !(importer is TextureImporter textureImporter)
+                    || textureImporter.textureType == TextureImporterType.Sprite
+                    || textureImporter.textureType == TextureImporterType.GUI)
+                    continue;
+
+                badTextures.Add(texture);
+            }
+
+            if (badTextures.Count == 0)
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("All texture dimensions are a power of 2!");
+            }
+            else
+            {
+                result.Status = TestResultStatus.VariableSeverityIssue;
+                result.AddMessage("The following texture dimensions are not a power of 2:", null, badTextures.ToArray());
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckTextureDimensions.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckTextureDimensions.cs.meta
new file mode 100644
index 0000000..eb27a1c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckTextureDimensions.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 073f1dacf3da34d4783140ae9d485d5f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckTextureDimensions.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckTypeNamespaces.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckTypeNamespaces.cs
new file mode 100644
index 0000000..46cf5b3
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckTypeNamespaces.cs	
@@ -0,0 +1,233 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services.Validation;
+using AssetStoreTools.Validator.TestDefinitions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor;
+using UnityObject = UnityEngine.Object;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class CheckTypeNamespaces : ITestScript
+    {
+        private readonly string[] ForbiddenNamespaces = new string[] { "Unity" };
+
+        private GenericTestConfig _config;
+        private IAssetUtilityService _assetUtility;
+        private IScriptUtilityService _scriptUtility;
+
+        private enum NamespaceEligibility
+        {
+            NoNamespace,
+            Ok,
+            Forbidden
+        }
+
+        private class AnalysisResult
+        {
+            public Dictionary<UnityObject, List<string>> TypesWithoutNamespaces;
+            public Dictionary<UnityObject, List<string>> ForbiddenNamespaces;
+
+            public bool HasIssues => TypesWithoutNamespaces.Count > 0
+                || ForbiddenNamespaces.Count > 0;
+        }
+
+        public CheckTypeNamespaces(GenericTestConfig config, IAssetUtilityService assetUtility, IScriptUtilityService scriptUtility)
+        {
+            _config = config;
+            _assetUtility = assetUtility;
+            _scriptUtility = scriptUtility;
+        }
+
+        public TestResult Run()
+        {
+            var result = new TestResult() { Status = TestResultStatus.Undefined };
+
+            var scriptResult = CheckScripts();
+            var assemblyResult = CheckAssemblies();
+
+            if (scriptResult.HasIssues || assemblyResult.HasIssues)
+            {
+                result.Status = TestResultStatus.Warning;
+
+                // Error conditions for forbidden namespaces
+
+                if (scriptResult.ForbiddenNamespaces.Count > 0)
+                {
+                    result.Status = TestResultStatus.Fail;
+                    result.AddMessage("The following scripts contain namespaces starting with a 'Unity' keyword:");
+                    AddJoinedMessage(result, scriptResult.ForbiddenNamespaces);
+                }
+
+                if (assemblyResult.ForbiddenNamespaces.Count > 0)
+                {
+                    result.Status = TestResultStatus.Fail;
+                    result.AddMessage("The following assemblies contain namespaces starting with a 'Unity' keyword:");
+                    AddJoinedMessage(result, assemblyResult.ForbiddenNamespaces);
+                }
+
+                // Variable severity conditions for no-namespace types
+
+                if (scriptResult.TypesWithoutNamespaces.Count > 0)
+                {
+                    if (result.Status != TestResultStatus.Fail)
+                        result.Status = TestResultStatus.VariableSeverityIssue;
+
+                    result.AddMessage("The following scripts contain types not nested under a namespace:");
+                    AddJoinedMessage(result, scriptResult.TypesWithoutNamespaces);
+                }
+
+                if (assemblyResult.TypesWithoutNamespaces.Count > 0)
+                {
+                    if (result.Status != TestResultStatus.Fail)
+                        result.Status = TestResultStatus.VariableSeverityIssue;
+
+                    result.AddMessage("The following assemblies contain types not nested under a namespace:");
+                    AddJoinedMessage(result, assemblyResult.TypesWithoutNamespaces);
+                }
+            }
+            else
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("All scripts contain valid namespaces!");
+            }
+
+            return result;
+        }
+
+        private AnalysisResult CheckScripts()
+        {
+            var scripts = _assetUtility.GetObjectsFromAssets<MonoScript>(_config.ValidationPaths, AssetType.MonoScript).ToArray();
+            var scriptNamespaces = _scriptUtility.GetTypeNamespacesFromScriptAssets(scripts);
+
+            var scriptsWithoutNamespaces = new Dictionary<UnityObject, List<string>>();
+            var scriptsWithForbiddenNamespaces = new Dictionary<UnityObject, List<string>>();
+
+            foreach (var kvp in scriptNamespaces)
+            {
+                var scriptAsset = kvp.Key;
+                var typesInScriptAsset = kvp.Value;
+
+                var typesWithoutNamespace = new List<string>();
+                var discouragedNamespaces = new List<string>();
+                var forbiddenNamespaces = new List<string>();
+
+                foreach (var t in typesInScriptAsset)
+                {
+                    var eligibility = CheckNamespaceEligibility(t.Namespace);
+
+                    switch (eligibility)
+                    {
+                        case NamespaceEligibility.NoNamespace:
+                            typesWithoutNamespace.Add(t.Name);
+                            break;
+                        case NamespaceEligibility.Forbidden:
+                            if (!forbiddenNamespaces.Contains(t.Namespace))
+                                forbiddenNamespaces.Add(t.Namespace);
+                            break;
+                        case NamespaceEligibility.Ok:
+                            break;
+                    }
+                }
+
+                if (typesWithoutNamespace.Count > 0)
+                    scriptsWithoutNamespaces.Add(scriptAsset, typesWithoutNamespace);
+
+                if (forbiddenNamespaces.Count > 0)
+                    scriptsWithForbiddenNamespaces.Add(scriptAsset, forbiddenNamespaces);
+            }
+
+            return new AnalysisResult
+            {
+                TypesWithoutNamespaces = scriptsWithoutNamespaces,
+                ForbiddenNamespaces = scriptsWithForbiddenNamespaces
+            };
+        }
+
+        private AnalysisResult CheckAssemblies()
+        {
+            var assemblies = _assetUtility.GetObjectsFromAssets(_config.ValidationPaths, AssetType.PrecompiledAssembly).ToList();
+            var assemblyTypes = _scriptUtility.GetTypesFromAssemblies(assemblies);
+
+            var assembliesWithoutNamespaces = new Dictionary<UnityObject, List<string>>();
+            var assembliesWithForbiddenNamespaces = new Dictionary<UnityObject, List<string>>();
+
+            foreach (var kvp in assemblyTypes)
+            {
+                var assemblyAsset = kvp.Key;
+                var typesInAssembly = kvp.Value;
+
+                var typesWithoutNamespace = new List<string>();
+                var discouragedNamespaces = new List<string>();
+                var forbiddenNamespaces = new List<string>();
+
+                foreach (var t in typesInAssembly)
+                {
+                    var eligibility = CheckNamespaceEligibility(t.Namespace);
+
+                    switch (eligibility)
+                    {
+                        case NamespaceEligibility.NoNamespace:
+                            typesWithoutNamespace.Add($"{GetTypeName(t)} {t.Name}");
+                            break;
+                        case NamespaceEligibility.Forbidden:
+                            if (!forbiddenNamespaces.Contains(t.Namespace))
+                                forbiddenNamespaces.Add(t.Namespace);
+                            break;
+                        case NamespaceEligibility.Ok:
+                            break;
+                    }
+                }
+
+                if (typesWithoutNamespace.Count > 0)
+                    assembliesWithoutNamespaces.Add(assemblyAsset, typesWithoutNamespace);
+
+                if (forbiddenNamespaces.Count > 0)
+                    assembliesWithForbiddenNamespaces.Add(assemblyAsset, forbiddenNamespaces);
+            }
+
+            return new AnalysisResult
+            {
+                TypesWithoutNamespaces = assembliesWithoutNamespaces,
+                ForbiddenNamespaces = assembliesWithForbiddenNamespaces
+            };
+        }
+
+        private NamespaceEligibility CheckNamespaceEligibility(string fullNamespace)
+        {
+            if (string.IsNullOrEmpty(fullNamespace))
+                return NamespaceEligibility.NoNamespace;
+
+            var split = fullNamespace.Split('.');
+            var topLevelNamespace = split[0];
+            if (ForbiddenNamespaces.Any(x => topLevelNamespace.StartsWith(x, StringComparison.OrdinalIgnoreCase)))
+                return NamespaceEligibility.Forbidden;
+
+            return NamespaceEligibility.Ok;
+        }
+
+        private string GetTypeName(Type type)
+        {
+            if (type.IsClass)
+                return "class";
+            if (type.IsInterface)
+                return "interface";
+            if (type.IsEnum)
+                return "enum";
+            if (type.IsValueType)
+                return "struct";
+
+            throw new ArgumentException($"Received an unrecognizable type {type}. Type must be either a class, interface, struct or enum");
+        }
+
+        private void AddJoinedMessage(TestResult result, Dictionary<UnityObject, List<string>> assetsWithMessages)
+        {
+            foreach (var kvp in assetsWithMessages)
+            {
+                var message = string.Join("\n", kvp.Value);
+                result.AddMessage(message, null, kvp.Key);
+            }
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckTypeNamespaces.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckTypeNamespaces.cs.meta
new file mode 100644
index 0000000..b8a80ea
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckTypeNamespaces.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 279249fa7ef8c2446b3a9f013eeedbf0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/CheckTypeNamespaces.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveExecutableFiles.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveExecutableFiles.cs
new file mode 100644
index 0000000..ce71c8c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveExecutableFiles.cs	
@@ -0,0 +1,38 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services.Validation;
+using AssetStoreTools.Validator.TestDefinitions;
+using System.Linq;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class RemoveExecutableFiles : ITestScript
+    {
+        private GenericTestConfig _config;
+        private IAssetUtilityService _assetUtility;
+
+        public RemoveExecutableFiles(GenericTestConfig config, IAssetUtilityService assetUtility)
+        {
+            _config = config;
+            _assetUtility = assetUtility;
+        }
+
+        public TestResult Run()
+        {
+            var result = new TestResult() { Status = TestResultStatus.Undefined };
+
+            var executables = _assetUtility.GetObjectsFromAssets(_config.ValidationPaths, AssetType.Executable).ToArray();
+
+            if (executables.Length == 0)
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("No executable files were found!");
+                return result;
+            }
+
+            result.Status = TestResultStatus.VariableSeverityIssue;
+            result.AddMessage("The following executable files were found", null, executables);
+
+            return result;
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveExecutableFiles.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveExecutableFiles.cs.meta
new file mode 100644
index 0000000..b45d0ee
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveExecutableFiles.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 8e4450592cc60e54286ad089b66db94d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveExecutableFiles.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveJPGFiles.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveJPGFiles.cs
new file mode 100644
index 0000000..4860bbb
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveJPGFiles.cs	
@@ -0,0 +1,38 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services.Validation;
+using AssetStoreTools.Validator.TestDefinitions;
+using System.Linq;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class RemoveJPGFiles : ITestScript
+    {
+        private GenericTestConfig _config;
+        private IAssetUtilityService _assetUtility;
+
+        public RemoveJPGFiles(GenericTestConfig config, IAssetUtilityService assetUtility)
+        {
+            _config = config;
+            _assetUtility = assetUtility;
+        }
+
+        public TestResult Run()
+        {
+            var result = new TestResult() { Status = TestResultStatus.Undefined };
+
+            var jpgs = _assetUtility.GetObjectsFromAssets(_config.ValidationPaths, AssetType.JPG).ToArray();
+
+            if (jpgs.Length == 0)
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("No JPG/JPEG textures were found!");
+                return result;
+            }
+
+            result.Status = TestResultStatus.VariableSeverityIssue;
+            result.AddMessage("The following textures are compressed as JPG/JPEG", null, jpgs);
+
+            return result;
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveJPGFiles.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveJPGFiles.cs.meta
new file mode 100644
index 0000000..4df41e6
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveJPGFiles.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 5634a12b3a8544c4585bbc280ae59ce2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveJPGFiles.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveJavaScriptFiles.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveJavaScriptFiles.cs
new file mode 100644
index 0000000..1996f38
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveJavaScriptFiles.cs	
@@ -0,0 +1,38 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services.Validation;
+using AssetStoreTools.Validator.TestDefinitions;
+using System.Linq;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class RemoveJavaScriptFiles : ITestScript
+    {
+        private GenericTestConfig _config;
+        private IAssetUtilityService _assetUtility;
+
+        public RemoveJavaScriptFiles(GenericTestConfig config, IAssetUtilityService assetUtility)
+        {
+            _config = config;
+            _assetUtility = assetUtility;
+        }
+
+        public TestResult Run()
+        {
+            var result = new TestResult() { Status = TestResultStatus.Undefined };
+
+            var javascriptObjects = _assetUtility.GetObjectsFromAssets(_config.ValidationPaths, AssetType.JavaScript).ToArray();
+
+            if (javascriptObjects.Length == 0)
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("No UnityScript / JS files were found!");
+                return result;
+            }
+
+            result.Status = TestResultStatus.VariableSeverityIssue;
+            result.AddMessage("The following assets are UnityScript / JS files", null, javascriptObjects);
+
+            return result;
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveJavaScriptFiles.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveJavaScriptFiles.cs.meta
new file mode 100644
index 0000000..6153ea4
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveJavaScriptFiles.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: ab1676bde9afba442b35fd3319c18063
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveJavaScriptFiles.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveLossyAudioFiles.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveLossyAudioFiles.cs
new file mode 100644
index 0000000..84fc911
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveLossyAudioFiles.cs	
@@ -0,0 +1,83 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services.Validation;
+using AssetStoreTools.Validator.TestDefinitions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using UnityObject = UnityEngine.Object;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class RemoveLossyAudioFiles : ITestScript
+    {
+        private GenericTestConfig _config;
+        private IAssetUtilityService _assetUtility;
+
+        public RemoveLossyAudioFiles(GenericTestConfig config, IAssetUtilityService assetUtility)
+        {
+            _config = config;
+            _assetUtility = assetUtility;
+        }
+
+        public TestResult Run()
+        {
+            var result = new TestResult() { Status = TestResultStatus.Undefined };
+
+            string SanitizeForComparison(UnityObject o)
+            {
+                Regex alphanumericRegex = new Regex("[^a-zA-Z0-9]");
+                string path = _assetUtility.ObjectToAssetPath(o);
+                path = path.ToLower();
+
+                int extensionIndex = path.LastIndexOf('.');
+                string extension = path.Substring(extensionIndex + 1);
+                string sanitized = path.Substring(0, extensionIndex);
+
+                int separatorIndex = sanitized.LastIndexOf('/');
+                sanitized = sanitized.Substring(separatorIndex);
+                sanitized = alphanumericRegex.Replace(sanitized, String.Empty);
+                sanitized = sanitized.Replace(extension, String.Empty);
+                sanitized = sanitized.Trim();
+
+                return sanitized;
+            }
+
+            var lossyAudioObjects = _assetUtility.GetObjectsFromAssets(_config.ValidationPaths, AssetType.LossyAudio).ToArray();
+            if (lossyAudioObjects.Length == 0)
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("No lossy audio files were found!");
+                return result;
+            }
+
+            // Try to find and match variants
+            var nonLossyAudioObjects = _assetUtility.GetObjectsFromAssets(_config.ValidationPaths, AssetType.NonLossyAudio);
+            HashSet<string> nonLossyPathSet = new HashSet<string>();
+            foreach (var asset in nonLossyAudioObjects)
+            {
+                var path = SanitizeForComparison(asset);
+                nonLossyPathSet.Add(path);
+            }
+
+            var unmatchedAssets = new List<UnityObject>();
+            foreach (var asset in lossyAudioObjects)
+            {
+                var path = SanitizeForComparison(asset);
+                if (!nonLossyPathSet.Contains(path))
+                    unmatchedAssets.Add(asset);
+            }
+
+            if (unmatchedAssets.Count == 0)
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("No lossy audio files were found!");
+                return result;
+            }
+
+            result.Status = TestResultStatus.VariableSeverityIssue;
+            result.AddMessage("The following lossy audio files were found without identically named non-lossy variants:", null, unmatchedAssets.ToArray());
+            return result;
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveLossyAudioFiles.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveLossyAudioFiles.cs.meta
new file mode 100644
index 0000000..55d0d0b
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveLossyAudioFiles.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: b7205a85061273a4eb50586f13f35d35
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveLossyAudioFiles.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveMixamoFiles.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveMixamoFiles.cs
new file mode 100644
index 0000000..04c2069
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveMixamoFiles.cs	
@@ -0,0 +1,38 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services.Validation;
+using AssetStoreTools.Validator.TestDefinitions;
+using System.Linq;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class RemoveMixamoFiles : ITestScript
+    {
+        private GenericTestConfig _config;
+        private IAssetUtilityService _assetUtility;
+
+        public RemoveMixamoFiles(GenericTestConfig config, IAssetUtilityService assetUtility)
+        {
+            _config = config;
+            _assetUtility = assetUtility;
+        }
+
+        public TestResult Run()
+        {
+            var result = new TestResult() { Status = TestResultStatus.Undefined };
+
+            var mixamoFiles = _assetUtility.GetObjectsFromAssets(_config.ValidationPaths, AssetType.Mixamo).ToArray();
+
+            if (mixamoFiles.Length == 0)
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("No Mixamo files were found!");
+                return result;
+            }
+
+            result.Status = TestResultStatus.VariableSeverityIssue;
+            result.AddMessage("The following Mixamo files were found", null, mixamoFiles);
+
+            return result;
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveMixamoFiles.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveMixamoFiles.cs.meta
new file mode 100644
index 0000000..603034c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveMixamoFiles.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 9df432e52aa958b44bb5e20c13d16552
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveMixamoFiles.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveSpeedTreeFiles.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveSpeedTreeFiles.cs
new file mode 100644
index 0000000..38c2c26
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveSpeedTreeFiles.cs	
@@ -0,0 +1,38 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services.Validation;
+using AssetStoreTools.Validator.TestDefinitions;
+using System.Linq;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class RemoveSpeedTreeFiles : ITestScript
+    {
+        private GenericTestConfig _config;
+        private IAssetUtilityService _assetUtility;
+
+        public RemoveSpeedTreeFiles(GenericTestConfig config, IAssetUtilityService assetUtility)
+        {
+            _config = config;
+            _assetUtility = assetUtility;
+        }
+
+        public TestResult Run()
+        {
+            var result = new TestResult() { Status = TestResultStatus.Undefined };
+
+            var speedtreeObjects = _assetUtility.GetObjectsFromAssets(_config.ValidationPaths, AssetType.SpeedTree).ToArray();
+
+            if (speedtreeObjects.Length == 0)
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("No SpeedTree assets have been found!");
+                return result;
+            }
+
+            result.Status = TestResultStatus.VariableSeverityIssue;
+            result.AddMessage("The following SpeedTree assets have been found", null, speedtreeObjects);
+
+            return result;
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveSpeedTreeFiles.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveSpeedTreeFiles.cs.meta
new file mode 100644
index 0000000..25f2a23
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveSpeedTreeFiles.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: e06bb7e0aa4f9944abc18281c002dff4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveSpeedTreeFiles.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveVideoFiles.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveVideoFiles.cs
new file mode 100644
index 0000000..25e69f2
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveVideoFiles.cs	
@@ -0,0 +1,38 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services.Validation;
+using AssetStoreTools.Validator.TestDefinitions;
+using System.Linq;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class RemoveVideoFiles : ITestScript
+    {
+        private GenericTestConfig _config;
+        private IAssetUtilityService _assetUtility;
+
+        public RemoveVideoFiles(GenericTestConfig config, IAssetUtilityService assetUtility)
+        {
+            _config = config;
+            _assetUtility = assetUtility;
+        }
+
+        public TestResult Run()
+        {
+            var result = new TestResult() { Status = TestResultStatus.Undefined };
+
+            var videos = _assetUtility.GetObjectsFromAssets(_config.ValidationPaths, AssetType.Video).ToArray();
+
+            if (videos.Length == 0)
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("No video files were found, looking good!");
+                return result;
+            }
+
+            result.Status = TestResultStatus.VariableSeverityIssue;
+            result.AddMessage("The following video files were found", null, videos);
+
+            return result;
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveVideoFiles.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveVideoFiles.cs.meta
new file mode 100644
index 0000000..80ca9b8
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveVideoFiles.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: f99724c71b0de66419b5d6e8e9bfcc2d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/Generic/RemoveVideoFiles.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/UnityPackage.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/UnityPackage.meta
new file mode 100644
index 0000000..b8fde81
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/UnityPackage.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 016d62b2cd8346a49815615efd1d6e39
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/UnityPackage/CheckDemoScenes.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/UnityPackage/CheckDemoScenes.cs
new file mode 100644
index 0000000..e5ce2cc
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/UnityPackage/CheckDemoScenes.cs	
@@ -0,0 +1,172 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services.Validation;
+using AssetStoreTools.Validator.TestDefinitions;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+using UnityObject = UnityEngine.Object;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class CheckDemoScenes : ITestScript
+    {
+        private class DemoSceneScanResult
+        {
+            public List<UnityObject> ValidAdbScenes;
+            public List<string> HybridScenePaths;
+            public List<UnityObject> NestedUnityPackages;
+        }
+
+        private GenericTestConfig _config;
+        private IAssetUtilityService _assetUtility;
+        private ISceneUtilityService _sceneUtility;
+
+        public CheckDemoScenes(GenericTestConfig config, IAssetUtilityService assetUtility, ISceneUtilityService sceneUtility)
+        {
+            _config = config;
+            _assetUtility = assetUtility;
+            _sceneUtility = sceneUtility;
+        }
+
+        public TestResult Run()
+        {
+            var result = new TestResult();
+            var demoSceneScanResult = CheckForDemoScenes(_config);
+
+            // Valid demo scenes were found in ADB
+            if (demoSceneScanResult.ValidAdbScenes.Count > 0)
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("Demo scenes found", null, demoSceneScanResult.ValidAdbScenes.ToArray());
+                return result;
+            }
+
+            // Valid demo scenes found in UPM package.json
+            if (demoSceneScanResult.HybridScenePaths.Count > 0)
+            {
+                result.Status = TestResultStatus.Pass;
+
+                var upmSampleSceneList = string.Join("\n-", demoSceneScanResult.HybridScenePaths);
+                upmSampleSceneList = upmSampleSceneList.Insert(0, "-");
+
+                result.AddMessage($"Demo scenes found:\n{upmSampleSceneList}");
+                return result;
+            }
+
+            // No valid scenes found, but package contains nested .unitypackages
+            if (demoSceneScanResult.NestedUnityPackages.Count > 0)
+            {
+                result.Status = TestResultStatus.Warning;
+                result.AddMessage("Could not find any valid Demo scenes in the selected validation paths.");
+                result.AddMessage("The following nested .unitypackage files were found. " +
+                    "If they contain any demo scenes, you can ignore this warning.", null, demoSceneScanResult.NestedUnityPackages.ToArray());
+                return result;
+            }
+
+            // No valid scenes were found and there is nothing pointing to their inclusion in the package
+            result.Status = TestResultStatus.VariableSeverityIssue;
+            result.AddMessage("Could not find any valid Demo Scenes in the selected validation paths.");
+            return result;
+        }
+
+        private DemoSceneScanResult CheckForDemoScenes(GenericTestConfig config)
+        {
+            var scanResult = new DemoSceneScanResult();
+            scanResult.ValidAdbScenes = CheckForDemoScenesInAssetDatabase(config);
+            scanResult.HybridScenePaths = CheckForDemoScenesInUpmSamples(config);
+            scanResult.NestedUnityPackages = CheckForNestedUnityPackages(config);
+
+            return scanResult;
+        }
+
+        private List<UnityObject> CheckForDemoScenesInAssetDatabase(GenericTestConfig config)
+        {
+            var scenePaths = _assetUtility.GetAssetPathsFromAssets(config.ValidationPaths, AssetType.Scene).ToArray();
+            if (scenePaths.Length == 0)
+                return new List<UnityObject>();
+
+            var originalScenePath = _sceneUtility.CurrentScenePath;
+            var validScenePaths = scenePaths.Where(CanBeDemoScene).ToArray();
+            _sceneUtility.OpenScene(originalScenePath);
+
+            if (validScenePaths.Length == 0)
+                return new List<UnityObject>();
+
+            return validScenePaths.Select(x => AssetDatabase.LoadAssetAtPath<UnityObject>(x)).ToList();
+        }
+
+        private bool CanBeDemoScene(string scenePath)
+        {
+            // Check skybox
+            var sceneSkyboxPath = _assetUtility.ObjectToAssetPath(RenderSettings.skybox).Replace("\\", "").Replace("/", "");
+            var defaultSkyboxPath = "Resources/unity_builtin_extra".Replace("\\", "").Replace("/", "");
+
+            if (!sceneSkyboxPath.Equals(defaultSkyboxPath, StringComparison.OrdinalIgnoreCase))
+                return true;
+
+            // Check GameObjects
+            _sceneUtility.OpenScene(scenePath);
+            var rootObjects = _sceneUtility.GetRootGameObjects();
+            var count = rootObjects.Length;
+
+            if (count == 0)
+                return false;
+
+            if (count != 2)
+                return true;
+
+            var cameraGOUnchanged = rootObjects.Any(o => o.TryGetComponent<Camera>(out _) && o.GetComponents(typeof(Component)).Length == 3);
+            var lightGOUnchanged = rootObjects.Any(o => o.TryGetComponent<Light>(out _) && o.GetComponents(typeof(Component)).Length == 2);
+
+            return !cameraGOUnchanged || !lightGOUnchanged;
+        }
+
+        private List<string> CheckForDemoScenesInUpmSamples(GenericTestConfig config)
+        {
+            var scenePaths = new List<string>();
+
+            foreach (var path in config.ValidationPaths)
+            {
+                if (!File.Exists($"{path}/package.json"))
+                    continue;
+
+                var packageJsonText = File.ReadAllText($"{path}/package.json");
+                var json = JObject.Parse(packageJsonText);
+
+                if (!json.ContainsKey("samples") || json["samples"].Type != JTokenType.Array || json["samples"].ToList().Count == 0)
+                    continue;
+
+                foreach (var sample in json["samples"].ToList())
+                {
+                    var samplePath = sample["path"].ToString();
+                    samplePath = $"{path}/{samplePath}";
+                    if (!Directory.Exists(samplePath))
+                        continue;
+
+                    var sampleScenePaths = Directory.GetFiles(samplePath, "*.unity", SearchOption.AllDirectories);
+                    foreach (var scenePath in sampleScenePaths)
+                    {
+                        // If meta file is not found, the sample will not be included with the exported .unitypackage
+                        if (!File.Exists($"{scenePath}.meta"))
+                            continue;
+
+                        if (!scenePaths.Contains(scenePath.Replace("\\", "/")))
+                            scenePaths.Add(scenePath.Replace("\\", "/"));
+                    }
+                }
+            }
+
+            return scenePaths;
+        }
+
+        private List<UnityObject> CheckForNestedUnityPackages(GenericTestConfig config)
+        {
+            var unityPackages = _assetUtility.GetObjectsFromAssets(config.ValidationPaths, AssetType.UnityPackage).ToArray();
+            return unityPackages.ToList();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/UnityPackage/CheckDemoScenes.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/UnityPackage/CheckDemoScenes.cs.meta
new file mode 100644
index 0000000..a3689d4
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/UnityPackage/CheckDemoScenes.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: f844c2dfa4669ff4eacf5591b544edaf
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/UnityPackage/CheckDemoScenes.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/UnityPackage/CheckDocumentation.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/UnityPackage/CheckDocumentation.cs
new file mode 100644
index 0000000..75ec7e3
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/UnityPackage/CheckDocumentation.cs	
@@ -0,0 +1,73 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services.Validation;
+using AssetStoreTools.Validator.TestDefinitions;
+using System;
+using System.IO;
+using System.Linq;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class CheckDocumentation : ITestScript
+    {
+        private GenericTestConfig _config;
+        private IAssetUtilityService _assetUtility;
+
+        public CheckDocumentation(GenericTestConfig config, IAssetUtilityService assetUtility)
+        {
+            _config = config;
+            _assetUtility = assetUtility;
+        }
+
+        public TestResult Run()
+        {
+            var result = new TestResult() { Status = TestResultStatus.Undefined };
+
+            var textFilePaths = _assetUtility.GetAssetPathsFromAssets(_config.ValidationPaths, AssetType.Documentation).ToArray();
+            var documentationFilePaths = textFilePaths.Where(CouldBeDocumentation).ToArray();
+
+            if (textFilePaths.Length == 0)
+            {
+                result.Status = TestResultStatus.VariableSeverityIssue;
+                result.AddMessage("No potential documentation files ('.txt', '.pdf', " +
+                                  "'.html', '.rtf', '.md') found within the given path.");
+            }
+            else if (documentationFilePaths.Length == 0)
+            {
+                result.Status = TestResultStatus.Warning;
+                var textFileObjects = textFilePaths.Select(_assetUtility.AssetPathToObject).ToArray();
+                result.AddMessage("The following files have been found to match the documentation file format," +
+                    " but may not be documentation in content",
+                    null, textFileObjects);
+            }
+            else
+            {
+                result.Status = TestResultStatus.Pass;
+                var documentationFileObjects = documentationFilePaths.Select(_assetUtility.AssetPathToObject).ToArray();
+                result.AddMessage("Found documentation files", null, documentationFileObjects);
+            }
+
+            return result;
+        }
+
+        private bool CouldBeDocumentation(string filePath)
+        {
+            if (filePath.EndsWith(".pdf"))
+                return true;
+
+            using (var fs = File.Open(filePath, FileMode.Open))
+            using (var bs = new BufferedStream(fs))
+            using (var sr = new StreamReader(bs))
+            {
+                string line;
+                while ((line = sr.ReadLine()) != null)
+                {
+                    var mentionsDocumentation = line.IndexOf("documentation", StringComparison.OrdinalIgnoreCase) >= 0;
+                    if (mentionsDocumentation)
+                        return true;
+                }
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/UnityPackage/CheckDocumentation.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/UnityPackage/CheckDocumentation.cs.meta
new file mode 100644
index 0000000..9115595
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/UnityPackage/CheckDocumentation.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 3c8425198983eda4c9b35aa0d59ea33c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/UnityPackage/CheckDocumentation.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/UnityPackage/CheckPackageSize.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/UnityPackage/CheckPackageSize.cs
new file mode 100644
index 0000000..936d776
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/UnityPackage/CheckPackageSize.cs	
@@ -0,0 +1,69 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.TestDefinitions;
+using System.IO;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class CheckPackageSize : ITestScript
+    {
+        private GenericTestConfig _config;
+
+        public CheckPackageSize(GenericTestConfig config)
+        {
+            _config = config;
+        }
+
+        public TestResult Run()
+        {
+            var result = new TestResult() { Status = TestResultStatus.Undefined };
+
+            var packageSize = CalculatePackageSize(_config.ValidationPaths);
+            float packageSizeInGB = packageSize / (1024f * 1024f * 1024f);
+            float maxPackageSizeInGB = Constants.Uploader.MaxPackageSizeBytes / (1024f * 1024f * 1024f);
+
+            if (packageSizeInGB - maxPackageSizeInGB >= 0.1f)
+            {
+                result.Status = TestResultStatus.Warning;
+
+                result.AddMessage($"The uncompressed size of your package ({packageSizeInGB:0.#} GB) exceeds the maximum allowed package size of {maxPackageSizeInGB:0.#} GB. " +
+                    $"Please make sure that the compressed .unitypackage size does not exceed the size limit.");
+            }
+            else
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("Your package does not exceed the maximum allowed package size!");
+            }
+
+            return result;
+        }
+
+        private long CalculatePackageSize(string[] assetPaths)
+        {
+            long totalSize = 0;
+
+            foreach (var path in assetPaths)
+            {
+                totalSize += CalculatePathSize(path);
+            }
+
+            return totalSize;
+        }
+
+        private long CalculatePathSize(string path)
+        {
+            long size = 0;
+
+            var dirInfo = new DirectoryInfo(path);
+            if (!dirInfo.Exists)
+                return size;
+
+            foreach (var file in dirInfo.EnumerateFiles())
+                size += file.Length;
+
+            foreach (var nestedDir in dirInfo.EnumerateDirectories())
+                size += CalculatePathSize(nestedDir.FullName);
+
+            return size;
+        }
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/UnityPackage/CheckPackageSize.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/UnityPackage/CheckPackageSize.cs.meta
new file mode 100644
index 0000000..36ea880
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/UnityPackage/CheckPackageSize.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: a8601b99f4afa5049954f3a2dd5996d6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/UnityPackage/CheckPackageSize.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/UnityPackage/CheckProjectTemplateAssets.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/UnityPackage/CheckProjectTemplateAssets.cs
new file mode 100644
index 0000000..66e4d30
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/UnityPackage/CheckProjectTemplateAssets.cs	
@@ -0,0 +1,217 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services.Validation;
+using AssetStoreTools.Validator.TestDefinitions;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+
+namespace AssetStoreTools.Validator.TestMethods
+{
+    internal class CheckProjectTemplateAssets : ITestScript
+    {
+        private GenericTestConfig _config;
+        private IAssetUtilityService _assetUtility;
+
+        // Constructor also accepts dependency injection of registered IValidatorService types
+        public CheckProjectTemplateAssets(GenericTestConfig config, IAssetUtilityService assetUtility)
+        {
+            _config = config;
+            _assetUtility = assetUtility;
+        }
+
+        public TestResult Run()
+        {
+            var result = new TestResult() { Status = TestResultStatus.Undefined };
+
+            var assets = _assetUtility.GetObjectsFromAssets<Object>(_config.ValidationPaths, AssetType.All);
+            var invalidAssetsByGuid = CheckGuids(assets);
+            var invalidAssetsByPath = CheckPaths(assets);
+
+            var hasIssues = invalidAssetsByGuid.Length > 0
+                || invalidAssetsByPath.Length > 0;
+
+            if (hasIssues)
+            {
+                result.Status = TestResultStatus.VariableSeverityIssue;
+
+                if (invalidAssetsByPath.Length > 0)
+                {
+                    result.AddMessage("The following assets were found to have an asset path which is common to project template asset paths. They should be renamed or moved:", null, invalidAssetsByPath);
+                }
+
+                if (invalidAssetsByGuid.Length > 0)
+                {
+                    result.AddMessage("The following assets were found to be using a GUID which is common to project template asset GUIDs. They should be assigned a new GUID:", null, invalidAssetsByGuid);
+                }
+            }
+            else
+            {
+                result.Status = TestResultStatus.Pass;
+                result.AddMessage("No common assets that might cause asset clashing were found!");
+            }
+
+            return result;
+        }
+
+        private Object[] CheckGuids(IEnumerable<Object> assets)
+        {
+            var clashingAssets = new List<Object>();
+            foreach (var asset in assets)
+            {
+                if (!AssetDatabase.TryGetGUIDAndLocalFileIdentifier(asset, out var guid, out long _))
+                    continue;
+
+                if (CommonTemplateAssets.Any(x => x.Key.Equals(guid, System.StringComparison.OrdinalIgnoreCase)))
+                    clashingAssets.Add(asset);
+            }
+
+            return clashingAssets.ToArray();
+        }
+
+        private Object[] CheckPaths(IEnumerable<Object> assets)
+        {
+            var clashingAssets = new List<Object>();
+            foreach (var asset in assets)
+            {
+                var assetPath = AssetDatabase.GetAssetPath(asset);
+                if (CommonTemplateAssets.Any(x => x.Value.Equals(assetPath, System.StringComparison.OrdinalIgnoreCase)))
+                    clashingAssets.Add(asset);
+            }
+
+            return clashingAssets.ToArray();
+        }
+
+        private Dictionary<string, string> CommonTemplateAssets = new Dictionary<string, string>()
+        {
+            {"3f9215ea0144899419cfbc0957140d3f", "Assets/DefaultVolumeProfile.asset"},
+            {"3d4c13846a3e9bd4c8ccfbd0657ed847", "Assets/DefaultVolumeProfile.asset"},
+            {"4cee8bca36f2ab74b8feb832747fa6f4", "Assets/Editor/com.unity.mobile.notifications/NotificationSettings.asset"},
+            {"45a04f37e0f48c744acc0874c4a8918a", "Assets/Editor/com.unity.mobile.notifications/NotificationSettings.asset"},
+            {"54a3a0570aebe8949bec4966f1376581", "Assets/HDRPDefaultResources/DefaultHDRISky.exr"},
+            {"e93c35b24eb03c74284e7dc0b755bfcc", "Assets/HDRPDefaultResources/DefaultHDRPAsset.asset"},
+            {"254320a857a30444da2c99496a186368", "Assets/HDRPDefaultResources/DefaultLookDevProfile.asset"},
+            {"2bfa7b9d63fa79e4abdc033f54a868d2", "Assets/HDRPDefaultResources/DefaultSceneRoot.prefab"},
+            {"f9e3ff5a1b8f49c4fa8686e68d2dadae", "Assets/HDRPDefaultResources/DefaultSceneRoot.prefab"},
+            {"d87f7d7815073e840834a16a518c1237", "Assets/HDRPDefaultResources/DefaultSettingsVolumeProfile.asset"},
+            {"145290c901d58b343bdeb3b4362c9ff2", "Assets/HDRPDefaultResources/DefaultVFXResources.asset"},
+            {"acc11144f57719542b5fa25f02e74afb", "Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset"},
+            {"582adbd84082fdb4faf7cd4beb1ccd14", "Assets/HDRPDefaultResources/HDRPDefaultSettings.asset"},
+            {"2801c2ff7303a7543a8727f862f6c236", "Assets/HDRPDefaultResources/Sky and Fog Settings Profile.asset"},
+            {"ea5c25297f0c0a04da0eabb1c26a7509", "Assets/HDRPDefaultResources/SkyFogSettingsProfile.asset"},
+            {"3590b91b4603b465dbb4216d601bff33", "Assets/InputSystem_Actions.inputactions"},
+            {"289c1b55c9541489481df5cc06664110", "Assets/InputSystem_Actions.inputactions"},
+            {"dc70d2c4f369241dd99afd7c451b813e", "Assets/InputSystem_Actions.inputactions"},
+            {"2bcd2660ca9b64942af0de543d8d7100", "Assets/InputSystem_Actions.inputactions"},
+            {"052faaac586de48259a63d0c4782560b", "Assets/InputSystem_Actions.inputactions"},
+            {"35845fe01580c41289b024647b1d1c53", "Assets/InputSystem_Actions.inputactions"},
+            {"8124e5870f4fd4c779e7a5f994e84ad1", "Assets/OutdoorsScene.unity"},
+            {"2dd802e4d37c65149922028d3e973832", "Assets/Presets/AudioCompressedInMemory.preset"},
+            {"e18fd6ecd9cdb524ca99844f39b9d9ac", "Assets/Presets/AudioCompressedInMemory.preset"},
+            {"86bcce7f5575b54408aa0f3a7d321039", "Assets/Presets/AudioStreaming.preset"},
+            {"460e573eb8466884baaa0b8475505f83", "Assets/Presets/AudioStreaming.preset"},
+            {"e8537455c6c08bd4e8bf0be3707da685", "Assets/Presets/Defaults/AlbedoTexture_Default.preset"},
+            {"7a99f8aa944efe94cb9bd74562b7d5f9", "Assets/Presets/Defaults/AlbedoTexture_Default.preset"},
+            {"0cd792cc87e492d43b4e95b205fc5cc6", "Assets/Presets/Defaults/AudioDecompressOnLoad_Default.preset"},
+            {"e7689051185d12f4298e1ebb2693a29f", "Assets/Presets/Defaults/AudioDecompressOnLoad.preset"},
+            {"463065d4f17d1d94d848aa127b94dd43", "Assets/Presets/Defaults/DirectionalLight_Default.preset"},
+            {"c1cf8506f04ef2c4a88b64b6c4202eea", "Assets/Presets/Defaults/DirectionalLight_Default.preset"},
+            {"8fa3055e2a1363246838debd20206d37", "Assets/Presets/Defaults/SSSSettings_Default.preset"},
+            {"78830bb1431cab940b74be615e2a739f", "Assets/Presets/HDRTexture.preset"},
+            {"14a57cf3b9fa1c74b884aa7e0dcf1faa", "Assets/Presets/NormalTexture.preset"},
+            {"1d826a4c23450f946b19c20560595a1f", "Assets/Presets/NormalTexture.preset"},
+            {"45f7b2e3c78185248b3adbb14429c2ab", "Assets/Presets/UtilityTexture.preset"},
+            {"78fae3569c6c66c46afc3d9d4fb0b8d4", "Assets/Presets/UtilityTexture.preset"},
+            {"9303d565bd8aa6948ba775e843320e4d", "Assets/Presets/UtilityTexture.preset"},
+            {"34f54ff1ff9415249a847506b6f2fec5", "Assets/Scenes/PrefabEditingScene.unity"},
+            {"cbfe36cfddfde964d9dfce63a355d5dd", "Assets/Scenes/samplescene.unity"},
+            {"2cda990e2423bbf4892e6590ba056729", "Assets/Scenes/SampleScene.unity"},
+            {"9fc0d4010bbf28b4594072e72b8655ab", "Assets/Scenes/SampleScene.unity"},
+            {"3db1837cc97a95e4c98610966fac2b0b", "Assets/Scenes/SampleScene.unity"},
+            {"3fc8acdd13e6c734bafef6554d6fdbcd", "Assets/Scenes/SampleScene.unity"},
+            {"8c9cfa26abfee488c85f1582747f6a02", "Assets/Scenes/SampleScene.unity"},
+            {"c850ee8c3b14cc8459e7e186857cf567", "Assets/Scenes/SampleScene.unity"},
+            {"99c9720ab356a0642a771bea13969a05", "Assets/Scenes/SampleScene.unity"},
+            {"d1c3109bdb54ad54c8a2b2838528e640", "Assets/Scenes/SampleScene.unity"},
+            {"477cc4148fad3449482a3bc3178594e2", "Assets/Scenes/SampleSceneLightingSettings.lighting"},
+            {"4eb578550bc4f824e97f0a72eac1f3a5", "Assets/Scripts/LookWithMouse.cs"},
+            {"87f6dfceb3e39a947a312f7eeaa2a113", "Assets/Scripts/PlayerMovement.cs"},
+            {"be76e5f14cfee674cb30b491fb72b09b", "Assets/Scripts/SimpleCameraController.cs"},
+            {"6547d18b2bc62c94aa5ec1e87434da4e", "Assets/Scripts/SimpleCameraController.cs"},
+            {"e8a636f62116c0a40bbfefdf876d4608", "Assets/Scripts/SimpleCameraController.cs"},
+            {"14e519c409be4a1428028347410f5677", "Assets/Scripts/SimpleCameraController.cs"},
+            {"a04c28107d77d5e42b7155783b8475b6", "Assets/Settings/Cockpit_Renderer.asset"},
+            {"ab09877e2e707104187f6f83e2f62510", "Assets/Settings/DefaultVolumeProfile.asset"},
+            {"238cd62f6b58cb04e9c94749c4a015a7", "Assets/Settings/DefaultVolumeProfile.asset"},
+            {"5a9a2dc462c7bde4f86d0615a19c2c72", "Assets/Settings/DiffusionProfiles/BambooLeaves.asset"},
+            {"78322c7f82657514ebe48203160e3f39", "Assets/Settings/Foliage.asset"},
+            {"3e2e6bfc59709614ab90c0cd7d755e48", "Assets/Settings/HDRP Balanced.asset"},
+            {"36dd385e759c96147b6463dcd1149c11", "Assets/Settings/HDRP High Fidelity.asset"},
+            {"168a2336534e4e043b2a210b6f8d379a", "Assets/Settings/HDRP Performant.asset"},
+            {"4594f4a3fb14247e192bcca6dc23c8ed", "Assets/Settings/HDRPDefaultResources/DefaultLookDevProfile.asset"},
+            {"14b392ee213d25a48b1feddbd9f5a9be", "Assets/Settings/HDRPDefaultResources/DefaultSettingsVolumeProfile.asset"},
+            {"879ffae44eefa4412bb327928f1a96dd", "Assets/Settings/HDRPDefaultResources/FoliageDiffusionProfile.asset"},
+            {"b9f3086da92434da0bc1518f19f0ce86", "Assets/Settings/HDRPDefaultResources/HDRenderPipelineAsset.asset"},
+            {"ac0316ca287ba459492b669ff1317a6f", "Assets/Settings/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset"},
+            {"48e911a1e337b44e2b85dbc65b47a594", "Assets/Settings/HDRPDefaultResources/SkinDiffusionProfile.asset"},
+            {"d03ed43fc9d8a4f2e9fa70c1c7916eb9", "Assets/Settings/Lit2DSceneTemplate.scenetemplate"},
+            {"65bc7dbf4170f435aa868c779acfb082", "Assets/Settings/Mobile_Renderer.asset"},
+            {"5e6cbd92db86f4b18aec3ed561671858", "Assets/Settings/Mobile_RPAsset.asset"},
+            {"23cccccf13c3d4170a9b21e52a9bc86b", "Assets/Settings/Mobile/Mobile_High_ScreenRenderer.asset"},
+            {"6e8f76111115f44e0a76c2bff3cec258", "Assets/Settings/Mobile/Mobile_Low_Renderer.asset"},
+            {"aed30aee6a3ceae4090dadd1934d2ad0", "Assets/Settings/Mobile/Mobile_Low_ScreenRenderer.asset"},
+            {"d7686b11d09df481bac3c76ecc5ea626", "Assets/Settings/Mobile/Mobile_Low.asset"},
+            {"f288ae1f4751b564a96ac7587541f7a2", "Assets/Settings/PC_Renderer.asset"},
+            {"4b83569d67af61e458304325a23e5dfd", "Assets/Settings/PC_RPAsset.asset"},
+            {"42b230d443c6d6c4b89c47f97db59121", "Assets/Settings/PC/PC_High_ScreenRenderer.asset"},
+            {"13ba41cd2fa191f43890b271bd110ed9", "Assets/Settings/PC/PC_Low_Renderer.asset"},
+            {"a73f6fa069dd14a42b40cbb01bae63b4", "Assets/Settings/PC/PC_Low_ScreenRenderer.asset"},
+            {"4eb9ff6b5314098428cfa0be7e36ccda", "Assets/Settings/PC/PC_Low.asset"},
+            {"573ac53c334415945bf239de2c2f0511", "Assets/Settings/PlayerControllerFPS.prefab"},
+            {"7ba2b06fb32e5274aad88925a5b8d3f5", "Assets/Settings/PostProcessVolumeProfile.asset"},
+            {"424799608f7334c24bf367e4bbfa7f9a", "Assets/Settings/Renderer2D.asset"},
+            {"183cbd347d25080429f42b520742bbd8", "Assets/Settings/SampleScenePostProcessingSettings.asset"},
+            {"10fc4df2da32a41aaa32d77bc913491c", "Assets/Settings/SampleSceneProfile.asset"},
+            {"a6560a915ef98420e9faacc1c7438823", "Assets/Settings/SampleSceneProfile.asset"},
+            {"a123fc0ac58cb774e8592c925f167e7c", "Assets/Settings/SampleSceneSkyandFogSettings.asset"},
+            {"26bdddf49760c61438938733f07fa2a2", "Assets/Settings/Skin.asset"},
+            {"8ba92e2dd7f884a0f88b98fa2d235fe7", "Assets/Settings/SkyandFogSettingsProfile.asset"},
+            {"4a8e21d5c33334b11b34a596161b9360", "Assets/Settings/UniversalRenderer.asset"},
+            {"18dc0cd2c080841dea60987a38ce93fa", "Assets/Settings/UniversalRenderPipelineGlobalSettings.asset"},
+            {"bdede76083021864d8ff8bf23b2f37f1", "Assets/Settings/UniversalRenderPipelineGlobalSettings.asset"},
+            {"19ba41d7c0026c3459d37c2fe90c55a0", "Assets/Settings/UniversalRP-HighQuality.asset"},
+            {"a31e9f9f9c9d4b9429ed0d1234e22103", "Assets/Settings/UniversalRP-LowQuality.asset"},
+            {"d847b876476d3d6468f5dfcd34266f96", "Assets/Settings/UniversalRP-MediumQuality.asset"},
+            {"681886c5eb7344803b6206f758bf0b1c", "Assets/Settings/UniversalRP.asset"},
+            {"e634585d5c4544dd297acaee93dc2beb", "Assets/Settings/URP-Balanced-Renderer.asset"},
+            {"e1260c1148f6143b28bae5ace5e9c5d1", "Assets/Settings/URP-Balanced.asset"},
+            {"c40be3174f62c4acf8c1216858c64956", "Assets/Settings/URP-HighFidelity-Renderer.asset"},
+            {"7b7fd9122c28c4d15b667c7040e3b3fd", "Assets/Settings/URP-HighFidelity.asset"},
+            {"707360a9c581a4bd7aa53bfeb1429f71", "Assets/Settings/URP-Performant-Renderer.asset"},
+            {"d0e2fc18fe036412f8223b3b3d9ad574", "Assets/Settings/URP-Performant.asset"},
+            {"b62413aeefabaaa41a4b5a71dd7ae1ac", "Assets/Settings/VolumeProfiles/CinematicProfile.asset"},
+            {"ac0c2cad5778d4544b6a690963e02fe3", "Assets/Settings/VolumeProfiles/DefaultVolumeProfile.asset"},
+            {"f2d4d916a6612574cad220d125febbf2", "Assets/Settings/VolumeProfiles/LowQualityVolumeProfile.asset"},
+            {"cef078630d63d0442a070f84d4f13735", "Assets/Settings/VolumeProfiles/MarketProfile.asset"},
+            {"7ede9c9f109e5c442b7d29e54b4996fc", "Assets/Settings/VolumeProfiles/MediaOverrides.asset"},
+            {"3532e98caae428047bcefe69a344f72c", "Assets/Settings/VolumeProfiles/OutlineEnabled.asset"},
+            {"bfc08ba7e35de1a44bb84a32f1a693e1", "Assets/Settings/VolumeProfiles/ZenGardenProfile.asset"},
+            {"59a34a3881431c246b3564a0f0ca5bb0", "Assets/Settings/Volumes/CinematicPhysicalCamera.asset"},
+            {"03bc34b71695890468eb021c73b228db", "Assets/Settings/Volumes/ScreenshotsTimelineProfile.asset"},
+            {"7f342610b85f4164f808a1f380dcc668", "Assets/Settings/Volumes/VolumeGlobal.asset"},
+            {"bd6d234073408c44ca3828113aac655e", "Assets/Settings/Volumes/VolumeRoom1.asset"},
+            {"d78a1b031ab26034eb6ec3cbc9fbcec3", "Assets/Settings/Volumes/VolumeRoom2.asset"},
+            {"5727d3e07f75c3744b6cc8a1e55850a9", "Assets/Settings/Volumes/VolumeRoom2Skylight.asset"},
+            {"06114ad16a0bc0a41957375ac3bf472e", "Assets/Settings/Volumes/VolumeRoom3.asset"},
+            {"1584bf21cf81d5147aa00e8a2deaf2fb", "Assets/Settings/Volumes/VolumeRoom3Corridor.asset"},
+            {"7bca3a07cdd522c4c8020832c20b3eae", "Assets/Settings/Volumes/VolumeRoom3Sitting.asset"},
+            {"2872d90954412244a8b4a477b939c3ca", "Assets/Settings/XR/Loaders/Mock_HMD_Loader.asset"},
+            {"f25758a0f79593d4a9b3ee30a17b4c2e", "Assets/Settings/XR/Loaders/Oculus_Loader.asset"},
+            {"9e9f2958d1b4b4642ace1d0c7770650b", "Assets/Settings/XR/Settings/Mock_HMD_Build_Settings.asset"},
+            {"290a6e6411d135049940bec2237b8938", "Assets/Settings/XR/Settings/Oculus_Settings.asset"},
+            {"4c1640683c539c14080cfd43fbeffbda", "Assets/Settings/XR/XRGeneralSettings.asset"},
+            {"93b439a37f63240aca3dd4e01d978a9f", "Assets/UniversalRenderPipelineGlobalSettings.asset"},
+            {"38b35347542e5af4c9b140950c5b18db", "Assets/UniversalRenderPipelineGlobalSettings.asset"}
+        };
+    }
+}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/UnityPackage/CheckProjectTemplateAssets.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/UnityPackage/CheckProjectTemplateAssets.cs.meta
new file mode 100644
index 0000000..59b111e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/UnityPackage/CheckProjectTemplateAssets.cs.meta	
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: f02d52a702c712e4e8089f7c2e65bae7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Test Methods/UnityPackage/CheckProjectTemplateAssets.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI.meta
new file mode 100644
index 0000000..f401e9e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0eed33a351c3c544ba6bf3cd29d24c26
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data.meta
new file mode 100644
index 0000000..c3a170c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 461bfd99d0923cd4a8dae2f440af1064
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Abstractions.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Abstractions.meta
new file mode 100644
index 0000000..93d4155
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Abstractions.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d7d9c6cc805e072429392e7a378d2c9c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Abstractions/IValidatorResults.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Abstractions/IValidatorResults.cs
new file mode 100644
index 0000000..45345a5
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Abstractions/IValidatorResults.cs
@@ -0,0 +1,15 @@
+using AssetStoreTools.Validator.Data;
+using System;
+using System.Collections.Generic;
+
+namespace AssetStoreTools.Validator.UI.Data
+{
+    internal interface IValidatorResults
+    {
+        event Action OnResultsChanged;
+        event Action OnRequireSerialize;
+
+        void LoadResult(ValidationResult result);
+        IEnumerable<IValidatorTestGroup> GetSortedTestGroups();
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Abstractions/IValidatorResults.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Abstractions/IValidatorResults.cs.meta
new file mode 100644
index 0000000..88224cb
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Abstractions/IValidatorResults.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 91c62333b36d5ef47989289e8f90c056
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Abstractions/IValidatorResults.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Abstractions/IValidatorSettings.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Abstractions/IValidatorSettings.cs
new file mode 100644
index 0000000..cffed7d
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Abstractions/IValidatorSettings.cs
@@ -0,0 +1,31 @@
+using AssetStoreTools.Validator.Data;
+using System;
+using System.Collections.Generic;
+
+namespace AssetStoreTools.Validator.UI.Data
+{
+    internal interface IValidatorSettings
+    {
+        event Action OnCategoryChanged;
+        event Action OnValidationTypeChanged;
+        event Action OnValidationPathsChanged;
+        event Action OnRequireSerialize;
+
+        void LoadSettings(ValidationSettings settings);
+
+        string GetActiveCategory();
+        void SetActiveCategory(string category);
+        List<string> GetAvailableCategories();
+
+        ValidationType GetValidationType();
+        void SetValidationType(ValidationType validationType);
+
+        List<string> GetValidationPaths();
+        void AddValidationPath(string path);
+        void RemoveValidationPath(string path);
+        void ClearValidationPaths();
+        bool IsValidationPathValid(string path, out string error);
+
+        IValidator CreateValidator();
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Abstractions/IValidatorSettings.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Abstractions/IValidatorSettings.cs.meta
new file mode 100644
index 0000000..d8ed8d4
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Abstractions/IValidatorSettings.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: cc6516196465ac6469258ef8950da607
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Abstractions/IValidatorSettings.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Abstractions/IValidatorTest.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Abstractions/IValidatorTest.cs
new file mode 100644
index 0000000..761b33b
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Abstractions/IValidatorTest.cs
@@ -0,0 +1,15 @@
+using AssetStoreTools.Validator.Data;
+
+namespace AssetStoreTools.Validator.UI.Data
+{
+    internal interface IValidatorTest
+    {
+        int Id { get; }
+        string Name { get; }
+        string Description { get; }
+        ValidationType ValidationType { get; }
+        TestResult Result { get; }
+
+        void SetResult(TestResult result);
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Abstractions/IValidatorTest.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Abstractions/IValidatorTest.cs.meta
new file mode 100644
index 0000000..dd9750e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Abstractions/IValidatorTest.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: d1e4d9ba8de8cfc4aa42786fbbc5037a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Abstractions/IValidatorTest.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Abstractions/IValidatorTestGroup.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Abstractions/IValidatorTestGroup.cs
new file mode 100644
index 0000000..325231d
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Abstractions/IValidatorTestGroup.cs
@@ -0,0 +1,12 @@
+using AssetStoreTools.Validator.Data;
+using System.Collections.Generic;
+
+namespace AssetStoreTools.Validator.UI.Data
+{
+    internal interface IValidatorTestGroup
+    {
+        string Name { get; }
+        TestResultStatus Status { get; }
+        IEnumerable<IValidatorTest> Tests { get; }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Abstractions/IValidatorTestGroup.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Abstractions/IValidatorTestGroup.cs.meta
new file mode 100644
index 0000000..ee7a657
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Abstractions/IValidatorTestGroup.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: fa8735b7eb65d3147ab8bdbf922f36cf
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Abstractions/IValidatorTestGroup.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Serialization.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Serialization.meta
new file mode 100644
index 0000000..4122afe
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Serialization.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ec536685238584f41bd268edaaf0ad7d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Serialization/ValidatorStateData.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Serialization/ValidatorStateData.cs
new file mode 100644
index 0000000..dc20b6c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Serialization/ValidatorStateData.cs
@@ -0,0 +1,28 @@
+using Newtonsoft.Json;
+
+namespace AssetStoreTools.Validator.UI.Data.Serialization
+{
+    internal class ValidatorStateData
+    {
+        [JsonProperty("validation_settings")]
+        private ValidatorStateSettings _settings;
+        [JsonProperty("validation_results")]
+        private ValidatorStateResults _results;
+
+        public ValidatorStateData()
+        {
+            _settings = new ValidatorStateSettings();
+            _results = new ValidatorStateResults();
+        }
+
+        public ValidatorStateSettings GetSettings()
+        {
+            return _settings;
+        }
+
+        public ValidatorStateResults GetResults()
+        {
+            return _results;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Serialization/ValidatorStateData.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Serialization/ValidatorStateData.cs.meta
new file mode 100644
index 0000000..e802952
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Serialization/ValidatorStateData.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: da7a885e302cb6b43855b68f44f2c0fc
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Serialization/ValidatorStateData.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Serialization/ValidatorStateDataContractResolver.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Serialization/ValidatorStateDataContractResolver.cs
new file mode 100644
index 0000000..61034e5
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Serialization/ValidatorStateDataContractResolver.cs
@@ -0,0 +1,26 @@
+using Newtonsoft.Json.Serialization;
+
+namespace AssetStoreTools.Validator.UI.Data.Serialization
+{
+    internal class ValidatorStateDataContractResolver : DefaultContractResolver
+    {
+        private static ValidatorStateDataContractResolver _instance;
+        public static ValidatorStateDataContractResolver Instance => _instance ?? (_instance = new ValidatorStateDataContractResolver());
+
+        private NamingStrategy _namingStrategy;
+
+        private ValidatorStateDataContractResolver()
+        {
+            _namingStrategy = new SnakeCaseNamingStrategy();
+        }
+
+        protected override string ResolvePropertyName(string propertyName)
+        {
+            var resolvedName = _namingStrategy.GetPropertyName(propertyName, false);
+            if (resolvedName.StartsWith("_"))
+                return resolvedName.Substring(1);
+
+            return resolvedName;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Serialization/ValidatorStateDataContractResolver.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Serialization/ValidatorStateDataContractResolver.cs.meta
new file mode 100644
index 0000000..79f1013
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Serialization/ValidatorStateDataContractResolver.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 60f0e8d9b2ab86547a288c337fb2be0a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Serialization/ValidatorStateDataContractResolver.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Serialization/ValidatorStateResults.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Serialization/ValidatorStateResults.cs
new file mode 100644
index 0000000..ac7d552
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Serialization/ValidatorStateResults.cs
@@ -0,0 +1,83 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.TestDefinitions;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace AssetStoreTools.Validator.UI.Data.Serialization
+{
+    internal class ValidatorStateResults
+    {
+        // Primary data
+        [JsonProperty("validation_status")]
+        private ValidationStatus _status;
+        [JsonProperty("test_results")]
+        private SortedDictionary<int, TestResult> _results;
+
+        // Secondary data
+        [JsonProperty("project_path")]
+        private string _projectPath;
+        [JsonProperty("had_compilation_errors")]
+        private bool _hadCompilationErrors;
+
+        public ValidatorStateResults()
+        {
+            _projectPath = string.Empty;
+            _status = ValidationStatus.NotRun;
+            _hadCompilationErrors = false;
+            _results = new SortedDictionary<int, TestResult>();
+        }
+
+        public ValidationStatus GetStatus()
+        {
+            return _status;
+        }
+
+        public void SetStatus(ValidationStatus status)
+        {
+            if (_status == status)
+                return;
+
+            _status = status;
+        }
+
+        public SortedDictionary<int, TestResult> GetResults()
+        {
+            return _results;
+        }
+
+        public void SetResults(IEnumerable<AutomatedTest> tests)
+        {
+            _results.Clear();
+            foreach (var test in tests)
+            {
+                _results.Add(test.Id, test.Result);
+            }
+        }
+
+        public string GetProjectPath()
+        {
+            return _projectPath;
+        }
+
+        public void SetProjectPath(string projectPath)
+        {
+            if (_projectPath == projectPath)
+                return;
+
+            _projectPath = projectPath;
+        }
+
+        public bool GetHadCompilationErrors()
+        {
+            return _hadCompilationErrors;
+        }
+
+        public void SetHadCompilationErrors(bool hadCompilationErrors)
+        {
+            if (_hadCompilationErrors == hadCompilationErrors)
+                return;
+
+            _hadCompilationErrors = hadCompilationErrors;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Serialization/ValidatorStateResults.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Serialization/ValidatorStateResults.cs.meta
new file mode 100644
index 0000000..d75bc1c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Serialization/ValidatorStateResults.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: a90c3acfa50e8da4aa3da2b9c669502d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Serialization/ValidatorStateResults.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Serialization/ValidatorStateSettings.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Serialization/ValidatorStateSettings.cs
new file mode 100644
index 0000000..8b5c178
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Serialization/ValidatorStateSettings.cs
@@ -0,0 +1,63 @@
+using AssetStoreTools.Validator.Data;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace AssetStoreTools.Validator.UI.Data.Serialization
+{
+    internal class ValidatorStateSettings
+    {
+        [JsonProperty("category")]
+        private string _category;
+        [JsonProperty("validation_type")]
+        private ValidationType _validationType;
+        [JsonProperty("validation_paths")]
+        private List<string> _validationPaths;
+
+        public ValidatorStateSettings()
+        {
+            _category = string.Empty;
+            _validationType = ValidationType.UnityPackage;
+            _validationPaths = new List<string>();
+        }
+
+        public string GetCategory()
+        {
+            return _category;
+        }
+
+        public void SetCategory(string category)
+        {
+            if (_category == category)
+                return;
+
+            _category = category;
+        }
+
+        public ValidationType GetValidationType()
+        {
+            return _validationType;
+        }
+
+        public void SetValidationType(ValidationType validationType)
+        {
+            if (validationType == _validationType)
+                return;
+
+            _validationType = validationType;
+        }
+
+        public List<string> GetValidationPaths()
+        {
+            return _validationPaths;
+        }
+
+        public void SetValidationPaths(List<string> validationPaths)
+        {
+            if (_validationPaths.SequenceEqual(validationPaths))
+                return;
+
+            _validationPaths = validationPaths;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Serialization/ValidatorStateSettings.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Serialization/ValidatorStateSettings.cs.meta
new file mode 100644
index 0000000..a11280a
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Serialization/ValidatorStateSettings.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: d39d56313ade8a8409aafe95dc84f79a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/Serialization/ValidatorStateSettings.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/ValidatorResults.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/ValidatorResults.cs
new file mode 100644
index 0000000..86650ff
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/ValidatorResults.cs
@@ -0,0 +1,137 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.TestDefinitions;
+using AssetStoreTools.Validator.UI.Data.Serialization;
+using AssetStoreTools.Validator.Utility;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace AssetStoreTools.Validator.UI.Data
+{
+    internal class ValidatorResults : IValidatorResults
+    {
+        private ValidatorStateResults _stateData;
+
+        private IValidatorSettings _settings;
+        private IEnumerable<IValidatorTest> _tests;
+
+        private readonly TestResultStatus[] _priorityGroups = new TestResultStatus[]
+        {
+            TestResultStatus.Undefined,
+            TestResultStatus.Fail,
+            TestResultStatus.Warning
+        };
+
+        public event Action OnResultsChanged;
+        public event Action OnRequireSerialize;
+
+        public ValidatorResults(IValidatorSettings settings, ValidatorStateResults stateData)
+        {
+            _settings = settings;
+            _stateData = stateData;
+
+            _tests = GetAllTests();
+
+            Deserialize();
+        }
+
+        private IEnumerable<IValidatorTest> GetAllTests()
+        {
+            var tests = new List<IValidatorTest>();
+            var testObjects = ValidatorUtility.GetAutomatedTestCases(ValidatorUtility.SortType.Alphabetical);
+
+            foreach (var testObject in testObjects)
+            {
+                var testSource = new AutomatedTest(testObject);
+                var test = new ValidatorTest(testSource);
+                tests.Add(test);
+            }
+
+            return tests;
+        }
+
+        public void LoadResult(ValidationResult result)
+        {
+            if (result == null)
+                return;
+
+            foreach (var test in _tests)
+            {
+                if (!result.Tests.Any(x => x.Id == test.Id))
+                    continue;
+
+                var matchingResult = result.Tests.First(x => x.Id == test.Id);
+                test.SetResult(matchingResult.Result);
+            }
+
+            OnResultsChanged?.Invoke();
+
+            Serialize(result);
+        }
+
+        public IEnumerable<IValidatorTestGroup> GetSortedTestGroups()
+        {
+            var groups = new List<IValidatorTestGroup>();
+            var testsByStatus = _tests
+                .Where(x => x.ValidationType == ValidationType.Generic || x.ValidationType == _settings.GetValidationType())
+                .GroupBy(x => x.Result.Status).ToDictionary(x => x.Key, x => x.ToList());
+
+            foreach (var kvp in testsByStatus)
+            {
+                var group = new ValidatorTestGroup(kvp.Key, kvp.Value);
+                groups.Add(group);
+            }
+
+            return SortGroups(groups);
+        }
+
+        private IEnumerable<IValidatorTestGroup> SortGroups(IEnumerable<IValidatorTestGroup> unsortedGroups)
+        {
+            var sortedGroups = new List<IValidatorTestGroup>();
+            var groups = unsortedGroups.OrderBy(x => x.Status).ToList();
+
+            // Select priority groups first
+            foreach (var priority in _priorityGroups)
+            {
+                var priorityGroup = groups.FirstOrDefault(x => x.Status == priority);
+                if (priorityGroup == null)
+                    continue;
+
+                sortedGroups.Add(priorityGroup);
+                groups.Remove(priorityGroup);
+            }
+
+            // Add the rest
+            sortedGroups.AddRange(groups);
+
+            return sortedGroups;
+        }
+
+        private void Serialize(ValidationResult result)
+        {
+            _stateData.SetStatus(result.Status);
+            _stateData.SetResults(result.Tests);
+            _stateData.SetProjectPath(result.ProjectPath);
+            _stateData.SetHadCompilationErrors(result.HadCompilationErrors);
+            OnRequireSerialize?.Invoke();
+        }
+
+        private void Deserialize()
+        {
+            if (_stateData == null)
+                return;
+
+            var serializedResults = _stateData.GetResults();
+            foreach (var test in _tests)
+            {
+                if (!serializedResults.Any(x => x.Key == test.Id))
+                    continue;
+
+                var matchingResult = serializedResults.First(x => x.Key == test.Id);
+                test.SetResult(matchingResult.Value);
+            }
+
+            OnResultsChanged?.Invoke();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/ValidatorResults.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/ValidatorResults.cs.meta
new file mode 100644
index 0000000..166ec32
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/ValidatorResults.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: bf2839f8b2340294aae39c2965039d2a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/ValidatorResults.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/ValidatorSettings.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/ValidatorSettings.cs
new file mode 100644
index 0000000..01abf73
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/ValidatorSettings.cs
@@ -0,0 +1,236 @@
+using AssetStoreTools.Utility;
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.UI.Data.Serialization;
+using AssetStoreTools.Validator.Utility;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using UnityEngine;
+
+namespace AssetStoreTools.Validator.UI.Data
+{
+    internal class ValidatorSettings : IValidatorSettings
+    {
+        private ValidatorStateSettings _stateData;
+
+        private string _category;
+        private ValidationType _validationType;
+        private List<string> _validationPaths;
+
+        public event Action OnCategoryChanged;
+        public event Action OnValidationTypeChanged;
+        public event Action OnValidationPathsChanged;
+        public event Action OnRequireSerialize;
+
+        public ValidatorSettings(ValidatorStateSettings stateData)
+        {
+            _stateData = stateData;
+
+            _category = string.Empty;
+            _validationType = ValidationType.UnityPackage;
+            _validationPaths = new List<string>();
+
+            Deserialize();
+        }
+
+        public void LoadSettings(ValidationSettings settings)
+        {
+            if (settings == null)
+                return;
+
+            var currentProjectValidationSettings = settings as CurrentProjectValidationSettings;
+            if (currentProjectValidationSettings == null)
+                throw new ArgumentException($"Only {nameof(CurrentProjectValidationSettings)} can be loaded");
+
+            _category = currentProjectValidationSettings.Category;
+            OnCategoryChanged?.Invoke();
+
+            _validationType = currentProjectValidationSettings.ValidationType;
+            OnValidationTypeChanged?.Invoke();
+
+            _validationPaths = currentProjectValidationSettings.ValidationPaths.ToList();
+            OnValidationPathsChanged?.Invoke();
+
+            Serialize();
+        }
+
+        public string GetActiveCategory()
+        {
+            return _category;
+        }
+
+        public void SetActiveCategory(string category)
+        {
+            if (category == _category)
+                return;
+
+            _category = category;
+            Serialize();
+            OnCategoryChanged?.Invoke();
+        }
+
+        public List<string> GetAvailableCategories()
+        {
+            var categories = new HashSet<string>();
+
+            var testData = ValidatorUtility.GetAutomatedTestCases();
+            foreach (var test in testData)
+            {
+                if (test.CategoryInfo == null)
+                    continue;
+
+                foreach (var filter in test.CategoryInfo.Filter)
+                    categories.Add(ConvertSlashToUnicodeSlash(filter));
+            }
+
+            return categories.OrderBy(x => x).ToList();
+        }
+
+        private string ConvertSlashToUnicodeSlash(string text)
+        {
+            return text.Replace('/', '\u2215');
+        }
+
+        public ValidationType GetValidationType()
+        {
+            return _validationType;
+        }
+
+        public void SetValidationType(ValidationType validationType)
+        {
+            if (validationType == _validationType)
+                return;
+
+            _validationType = validationType;
+
+            Serialize();
+            OnValidationTypeChanged?.Invoke();
+        }
+
+        public List<string> GetValidationPaths()
+        {
+            return _validationPaths;
+        }
+
+        public void AddValidationPath(string path)
+        {
+            if (string.IsNullOrEmpty(path))
+                return;
+
+            if (_validationPaths.Contains(path))
+                return;
+
+            // Prevent redundancy for new paths
+            var existingPath = _validationPaths.FirstOrDefault(x => path.StartsWith(x + "/"));
+            if (existingPath != null)
+            {
+                Debug.LogWarning($"Path '{path}' is already included with existing path: '{existingPath}'");
+                return;
+            }
+
+            // Prevent redundancy for already added paths
+            var redundantPaths = _validationPaths.Where(x => x.StartsWith(path + "/")).ToArray();
+            foreach (var redundantPath in redundantPaths)
+            {
+                Debug.LogWarning($"Existing validation path '{redundantPath}' has been made redundant by the inclusion of new validation path: '{path}'");
+                _validationPaths.Remove(redundantPath);
+            }
+
+            _validationPaths.Add(path);
+
+            Serialize();
+            OnValidationPathsChanged?.Invoke();
+        }
+
+        public void RemoveValidationPath(string path)
+        {
+            if (!_validationPaths.Contains(path))
+                return;
+
+            _validationPaths.Remove(path);
+
+            Serialize();
+            OnValidationPathsChanged?.Invoke();
+        }
+
+        public void ClearValidationPaths()
+        {
+            if (_validationPaths.Count == 0)
+                return;
+
+            _validationPaths.Clear();
+
+            Serialize();
+            OnValidationPathsChanged?.Invoke();
+        }
+
+        public bool IsValidationPathValid(string path, out string error)
+        {
+            error = string.Empty;
+
+            if (string.IsNullOrEmpty(path))
+            {
+                error = "Path cannot be empty";
+                return false;
+            }
+
+            var isAssetsPath = path.StartsWith("Assets/")
+                || path.Equals("Assets");
+            var isPackagePath = PackageUtility.GetPackageByManifestPath($"{path}/package.json", out _);
+
+            if (!isAssetsPath && !isPackagePath)
+            {
+                error = "Selected path must be within the Assets folder or point to a root path of a package";
+                return false;
+            }
+
+            if (!Directory.Exists(path))
+            {
+                error = "Path does not exist";
+                return false;
+            }
+
+            if (path.Split('/').Any(x => x.StartsWith(".") || x.EndsWith("~")))
+            {
+                error = $"Path '{path}' cannot be validated as it is a hidden folder and not part of the Asset Database";
+                return false;
+            }
+
+            return true;
+        }
+
+        public IValidator CreateValidator()
+        {
+            var settings = new CurrentProjectValidationSettings()
+            {
+                Category = _category,
+                ValidationType = _validationType,
+                ValidationPaths = _validationPaths
+            };
+
+            var validator = new CurrentProjectValidator(settings);
+            return validator;
+        }
+
+        private void Serialize()
+        {
+            _stateData.SetCategory(_category);
+            _stateData.SetValidationType(_validationType);
+            _stateData.SetValidationPaths(_validationPaths);
+
+            OnRequireSerialize?.Invoke();
+        }
+
+        private void Deserialize()
+        {
+            if (_stateData == null)
+                return;
+
+            _category = _stateData.GetCategory();
+            _validationType = _stateData.GetValidationType();
+            foreach (var path in _stateData.GetValidationPaths())
+                _validationPaths.Add(path);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/ValidatorSettings.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/ValidatorSettings.cs.meta
new file mode 100644
index 0000000..f2f3aec
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/ValidatorSettings.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 89504c2259614a743a164c5c162a197a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/ValidatorSettings.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/ValidatorTest.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/ValidatorTest.cs
new file mode 100644
index 0000000..968d5ca
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/ValidatorTest.cs
@@ -0,0 +1,28 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.TestDefinitions;
+
+namespace AssetStoreTools.Validator.UI.Data
+{
+    internal class ValidatorTest : IValidatorTest
+    {
+        public int Id { get; private set; }
+        public string Name { get; private set; }
+        public string Description { get; private set; }
+        public ValidationType ValidationType { get; private set; }
+        public TestResult Result { get; private set; }
+
+        public ValidatorTest(AutomatedTest source)
+        {
+            Id = source.Id;
+            Name = source.Title;
+            Description = source.Description;
+            ValidationType = source.ValidationType;
+            Result = source.Result;
+        }
+
+        public void SetResult(TestResult result)
+        {
+            Result = result;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/ValidatorTest.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/ValidatorTest.cs.meta
new file mode 100644
index 0000000..f209046
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/ValidatorTest.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 838e8d45ce997d8489185bc194dfcf25
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/ValidatorTest.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/ValidatorTestGroup.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/ValidatorTestGroup.cs
new file mode 100644
index 0000000..f76dc9f
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/ValidatorTestGroup.cs
@@ -0,0 +1,18 @@
+using AssetStoreTools.Validator.Data;
+using System.Collections.Generic;
+
+namespace AssetStoreTools.Validator.UI.Data
+{
+    internal class ValidatorTestGroup : IValidatorTestGroup
+    {
+        public string Name => Status.ToString();
+        public TestResultStatus Status { get; private set; }
+        public IEnumerable<IValidatorTest> Tests { get; private set; }
+
+        public ValidatorTestGroup(TestResultStatus status, IEnumerable<IValidatorTest> tests)
+        {
+            Status = status;
+            Tests = tests;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/ValidatorTestGroup.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/ValidatorTestGroup.cs.meta
new file mode 100644
index 0000000..c648a66
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/ValidatorTestGroup.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 8f5d1fc9ff785904fb2e663e9232a7a5
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Data/ValidatorTestGroup.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements.meta
new file mode 100644
index 0000000..9a9f507
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7ee7e5be29b8b184ba2abcd3ed38454e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorButtonElement.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorButtonElement.cs
new file mode 100644
index 0000000..717e834
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorButtonElement.cs
@@ -0,0 +1,50 @@
+using AssetStoreTools.Validator.UI.Data;
+using System;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Validator.UI.Elements
+{
+    internal class ValidatorButtonElement : VisualElement
+    {
+        // Data
+        private IValidatorSettings _settings;
+
+        // UI
+        private Button _validateButton;
+
+        public event Action OnValidate;
+
+        public ValidatorButtonElement(IValidatorSettings settings)
+        {
+            _settings = settings;
+            _settings.OnValidationPathsChanged += ValidationPathsChanged;
+
+            Create();
+            Deserialize();
+        }
+
+        private void Create()
+        {
+            _validateButton = new Button(Validate) { text = "Validate" };
+            _validateButton.AddToClassList("validator-validate-button");
+
+            Add(_validateButton);
+        }
+
+        private void Validate()
+        {
+            OnValidate?.Invoke();
+        }
+
+        private void ValidationPathsChanged()
+        {
+            var validationPathsPresent = _settings.GetValidationPaths().Count > 0;
+            _validateButton.SetEnabled(validationPathsPresent);
+        }
+
+        private void Deserialize()
+        {
+            ValidationPathsChanged();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorButtonElement.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorButtonElement.cs.meta
new file mode 100644
index 0000000..1e54d93
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorButtonElement.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 44fac105314df6341bf6a70fb3200baf
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorButtonElement.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorDescriptionElement.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorDescriptionElement.cs
new file mode 100644
index 0000000..ab55c2b
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorDescriptionElement.cs
@@ -0,0 +1,114 @@
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Validator.UI.Elements
+{
+    internal class ValidatorDescriptionElement : VisualElement
+    {
+        private const string DescriptionFoldoutText = "Validate your package to ensure your content follows the chosen submission guidelines.";
+        private const string DescriptionFoldoutContentText = "The validations below do not cover all of the content standards, and passing all validations does not " +
+                "guarantee that your package will be accepted to the Asset Store.\n\n" +
+                "The tests are not obligatory for submitting your assets, but they can help avoid instant rejection by the " +
+                "automated vetting system, or clarify reasons of rejection communicated by the vetting team.\n\n" +
+                "For more information about the validations, view the message by expanding the tests or contact our support team.";
+
+        private VisualElement _descriptionSimpleContainer;
+        private Label _descriptionSimpleLabel;
+        private Button _showMoreButton;
+
+        private VisualElement _descriptionFullContainer;
+        private Button _showLessButton;
+
+        public ValidatorDescriptionElement()
+        {
+            AddToClassList("validator-description");
+            Create();
+        }
+
+        private void Create()
+        {
+            CreateSimpleDescription();
+            CreateFullDescription();
+        }
+
+        private void CreateSimpleDescription()
+        {
+            _descriptionSimpleContainer = new VisualElement();
+            _descriptionSimpleContainer.AddToClassList("validator-description-simple-container");
+
+            _descriptionSimpleLabel = new Label(DescriptionFoldoutText);
+            _descriptionSimpleLabel.AddToClassList("validator-description-simple-label");
+
+            _showMoreButton = new Button(ToggleFullDescription) { text = "Show more..." };
+            _showMoreButton.AddToClassList("validator-description-show-button");
+            _showMoreButton.AddToClassList("validator-description-hyperlink-button");
+
+            _descriptionSimpleContainer.Add(_descriptionSimpleLabel);
+            _descriptionSimpleContainer.Add(_showMoreButton);
+
+            Add(_descriptionSimpleContainer);
+        }
+
+        private void CreateFullDescription()
+        {
+            _descriptionFullContainer = new VisualElement();
+            _descriptionFullContainer.AddToClassList("validator-description-full-container");
+
+            var validatorDescription = new Label()
+            {
+                text = DescriptionFoldoutContentText
+            };
+            validatorDescription.AddToClassList("validator-description-full-label");
+
+            var submissionGuidelinesButton = new Button(OpenSubmissionGuidelinesUrl)
+            {
+                text = "Submission Guidelines"
+            };
+            submissionGuidelinesButton.AddToClassList("validator-description-hyperlink-button");
+
+            var supportTicketButton = new Button(OpenSupportTicketUrl)
+            {
+                text = "Contact our Support Team"
+            };
+            supportTicketButton.AddToClassList("validator-description-hyperlink-button");
+
+            _showLessButton = new Button(ToggleFullDescription) { text = "Show less..." };
+            _showLessButton.AddToClassList("validator-description-hide-button");
+            _showLessButton.AddToClassList("validator-description-hyperlink-button");
+
+            _descriptionFullContainer.Add(validatorDescription);
+            _descriptionFullContainer.Add(submissionGuidelinesButton);
+            _descriptionFullContainer.Add(supportTicketButton);
+            _descriptionFullContainer.Add(_showLessButton);
+
+            _descriptionFullContainer.style.display = DisplayStyle.None;
+            Add(_descriptionFullContainer);
+        }
+
+        private void ToggleFullDescription()
+        {
+            var displayFullDescription = _descriptionFullContainer.style.display == DisplayStyle.None;
+
+            if (displayFullDescription)
+            {
+                _showMoreButton.style.display = DisplayStyle.None;
+                _descriptionFullContainer.style.display = DisplayStyle.Flex;
+            }
+            else
+            {
+                _showMoreButton.style.display = DisplayStyle.Flex;
+                _descriptionFullContainer.style.display = DisplayStyle.None;
+            }
+        }
+
+        private void OpenSubmissionGuidelinesUrl()
+        {
+            Application.OpenURL(Constants.Validator.SubmissionGuidelinesUrl);
+        }
+
+        private void OpenSupportTicketUrl()
+        {
+            Application.OpenURL(Constants.Validator.SupportTicketUrl);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorDescriptionElement.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorDescriptionElement.cs.meta
new file mode 100644
index 0000000..14c5f70
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorDescriptionElement.cs.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 9866d77420d947ba852055eed2bac895
+timeCreated: 1653383883
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorDescriptionElement.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorPathsElement.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorPathsElement.cs
new file mode 100644
index 0000000..3a2a170
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorPathsElement.cs
@@ -0,0 +1,128 @@
+using AssetStoreTools.Utility;
+using AssetStoreTools.Validator.UI.Data;
+using UnityEditor;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Validator.UI.Elements
+{
+    internal class ValidatorPathsElement : VisualElement
+    {
+        // Data
+        private IValidatorSettings _settings;
+
+        // UI
+        private ScrollView _pathBoxScrollView;
+
+        public ValidatorPathsElement(IValidatorSettings settings)
+        {
+            AddToClassList("validator-paths");
+
+            _settings = settings;
+            _settings.OnValidationPathsChanged += ValidationPathsChanged;
+
+            Create();
+            Deserialize();
+        }
+
+        private void Create()
+        {
+            var pathSelectionRow = new VisualElement();
+            pathSelectionRow.AddToClassList("validator-settings-selection-row");
+
+            VisualElement labelHelpRow = new VisualElement();
+            labelHelpRow.AddToClassList("validator-settings-selection-label-help-row");
+            labelHelpRow.style.alignSelf = Align.FlexStart;
+
+            Label pathLabel = new Label { text = "Validation paths" };
+            Image pathLabelTooltip = new Image
+            {
+                tooltip = "Select the folder (or multiple folders) that your package consists of." +
+                          "\n\nAll files and folders of your package should be contained within " +
+                          "a single root folder that is named after your package " +
+                          "(e.g. 'Assets/[MyPackageName]' or 'Packages/[MyPackageName]')" +
+                          "\n\nIf your package includes special folders that cannot be nested within " +
+                          "the root package folder (e.g. 'WebGLTemplates'), they should be added to this list " +
+                          "together with the root package folder"
+            };
+
+            labelHelpRow.Add(pathLabel);
+            labelHelpRow.Add(pathLabelTooltip);
+
+            var fullPathBox = new VisualElement() { name = "ValidationPaths" };
+            fullPathBox.AddToClassList("validator-paths-box");
+
+            _pathBoxScrollView = new ScrollView { name = "ValidationPathsScrollView" };
+            _pathBoxScrollView.AddToClassList("validator-paths-scroll-view");
+
+            VisualElement scrollViewBottomRow = new VisualElement();
+            scrollViewBottomRow.AddToClassList("validator-paths-scroll-view-bottom-row");
+
+            var addExtraPathsButton = new Button(BrowsePath) { text = "Add a path" };
+            addExtraPathsButton.AddToClassList("validator-paths-add-button");
+            scrollViewBottomRow.Add(addExtraPathsButton);
+
+            fullPathBox.Add(_pathBoxScrollView);
+            fullPathBox.Add(scrollViewBottomRow);
+
+            pathSelectionRow.Add(labelHelpRow);
+            pathSelectionRow.Add(fullPathBox);
+
+            Add(pathSelectionRow);
+        }
+
+        private VisualElement CreateSinglePathElement(string path)
+        {
+            var validationPath = new VisualElement();
+            validationPath.AddToClassList("validator-paths-path-row");
+
+            var folderPathLabel = new Label(path);
+            folderPathLabel.AddToClassList("validator-paths-path-row-input-field");
+
+            var removeButton = new Button(() =>
+            {
+                _settings.RemoveValidationPath(path);
+            });
+            removeButton.text = "X";
+            removeButton.AddToClassList("validator-paths-path-row-remove-button");
+
+            validationPath.Add(folderPathLabel);
+            validationPath.Add(removeButton);
+
+            return validationPath;
+        }
+
+        private void BrowsePath()
+        {
+            string absolutePath = EditorUtility.OpenFolderPanel("Select a directory", "Assets", "");
+
+            if (string.IsNullOrEmpty(absolutePath))
+                return;
+
+            var relativePath = FileUtility.AbsolutePathToRelativePath(absolutePath, ASToolsPreferences.Instance.EnableSymlinkSupport);
+
+            if (!_settings.IsValidationPathValid(relativePath, out var error))
+            {
+                EditorUtility.DisplayDialog("Invalid path", error, "OK");
+                return;
+            }
+
+            _settings.AddValidationPath(relativePath);
+        }
+
+        private void ValidationPathsChanged()
+        {
+            var validationPaths = _settings.GetValidationPaths();
+
+            _pathBoxScrollView.Clear();
+            foreach (var path in validationPaths)
+            {
+                _pathBoxScrollView.Add(CreateSinglePathElement(path));
+            }
+        }
+
+        private void Deserialize()
+        {
+            ValidationPathsChanged();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorPathsElement.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorPathsElement.cs.meta
new file mode 100644
index 0000000..a0c57ef
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorPathsElement.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 370dcd3bc87ace647940b4b07147bf93
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorPathsElement.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorResultsElement.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorResultsElement.cs
new file mode 100644
index 0000000..a01cad0
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorResultsElement.cs
@@ -0,0 +1,47 @@
+using AssetStoreTools.Validator.UI.Data;
+using System.Linq;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Validator.UI.Elements
+{
+    internal class ValidatorResultsElement : ScrollView
+    {
+        private IValidatorResults _results;
+
+        public ValidatorResultsElement(IValidatorResults results)
+        {
+            AddToClassList("validator-test-list");
+
+            _results = results;
+            _results.OnResultsChanged += ResultsChanged;
+
+            Create();
+        }
+
+        private void Create()
+        {
+            var groups = _results.GetSortedTestGroups().ToList();
+            for (int i = 0; i < groups.Count; i++)
+            {
+                var groupElement = new ValidatorTestGroupElement(groups[i]);
+                Add(groupElement);
+                if (i != groups.Count - 1)
+                    Add(CreateSeparator());
+            }
+        }
+
+        private void ResultsChanged()
+        {
+            Clear();
+            Create();
+        }
+
+        private VisualElement CreateSeparator()
+        {
+            var groupSeparator = new VisualElement { name = "GroupSeparator" };
+            groupSeparator.AddToClassList("validator-test-list-group-separator");
+
+            return groupSeparator;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorResultsElement.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorResultsElement.cs.meta
new file mode 100644
index 0000000..9c93432
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorResultsElement.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 12f80f9088944a149a34b3f078ca859a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorResultsElement.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorSettingsElement.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorSettingsElement.cs
new file mode 100644
index 0000000..6c70e7f
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorSettingsElement.cs
@@ -0,0 +1,96 @@
+using AssetStoreTools.Validator.UI.Data;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Validator.UI.Elements
+{
+    internal class ValidatorSettingsElement : VisualElement
+    {
+        // Data
+        private IValidatorSettings _settings;
+
+        // UI
+        private ToolbarMenu _categoryMenu;
+        private ValidatorPathsElement _validationPathsElement;
+
+        public ValidatorSettingsElement(IValidatorSettings settings)
+        {
+            AddToClassList("validator-settings");
+
+            _settings = settings;
+            _settings.OnCategoryChanged += CategoryChanged;
+
+            Create();
+            Deserialize();
+        }
+
+        public void Create()
+        {
+            CreateCategorySelection();
+            CreateValidationPathSelection();
+        }
+
+        private void CreateCategorySelection()
+        {
+            var categorySelectionBox = new VisualElement();
+            categorySelectionBox.AddToClassList("validator-settings-selection-row");
+
+            VisualElement labelHelpRow = new VisualElement();
+            labelHelpRow.AddToClassList("validator-settings-selection-label-help-row");
+
+            Label categoryLabel = new Label { text = "Category" };
+            Image categoryLabelTooltip = new Image
+            {
+                tooltip = "Choose a base category of your package" +
+                          "\n\nThis can be found in the Publishing Portal when creating the package listing or just " +
+                          "selecting a planned one." +
+                          "\n\nNote: Different categories could have different severities of several test cases."
+            };
+
+            labelHelpRow.Add(categoryLabel);
+            labelHelpRow.Add(categoryLabelTooltip);
+
+            _categoryMenu = new ToolbarMenu { name = "CategoryMenu" };
+            _categoryMenu.AddToClassList("validator-settings-selection-dropdown");
+
+            categorySelectionBox.Add(labelHelpRow);
+            categorySelectionBox.Add(_categoryMenu);
+
+            // Append available categories
+            var categories = _settings.GetAvailableCategories();
+            foreach (var category in categories)
+            {
+                _categoryMenu.menu.AppendAction(category, _ => _settings.SetActiveCategory(category));
+            }
+
+            // Append misc category
+            _categoryMenu.menu.AppendAction("Other", _ => _settings.SetActiveCategory(string.Empty));
+
+            Add(categorySelectionBox);
+        }
+
+        private void CreateValidationPathSelection()
+        {
+            _validationPathsElement = new ValidatorPathsElement(_settings);
+            Add(_validationPathsElement);
+        }
+
+        private void CategoryChanged()
+        {
+            var category = _settings.GetActiveCategory();
+            if (!string.IsNullOrEmpty(category))
+                _categoryMenu.text = category;
+            else
+                _categoryMenu.text = "Other";
+        }
+
+        private void Deserialize()
+        {
+            if (_settings == null)
+                return;
+
+            // Set initial category
+            CategoryChanged();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorSettingsElement.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorSettingsElement.cs.meta
new file mode 100644
index 0000000..3ffe0c8
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorSettingsElement.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 760d25556d755d544bece3a605adea09
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorSettingsElement.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorTestElement.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorTestElement.cs
new file mode 100644
index 0000000..a031d2d
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorTestElement.cs
@@ -0,0 +1,239 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.UI.Data;
+using AssetStoreTools.Validator.Utility;
+using System.Linq;
+using UnityEditor.SceneManagement;
+using UnityEditor.UIElements;
+using UnityEngine;
+using UnityEngine.Events;
+using UnityEngine.SceneManagement;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Validator.UI.Elements
+{
+    internal class ValidatorTestElement : VisualElement
+    {
+        // Data
+        private IValidatorTest _test;
+        private bool _isExpanded;
+
+        // UI
+        private Button _testFoldoutButton;
+        private Label _testFoldoutExpandStateLabel;
+        private Label _testFoldoutLabel;
+        private Image _testStatusImage;
+
+        private VisualElement _testContent;
+        private VisualElement _resultMessagesBox;
+
+        public ValidatorTestElement(IValidatorTest test)
+        {
+            AddToClassList("validator-test");
+
+            _test = test;
+
+            Create();
+            Unexpand();
+
+            SubscribeToSceneChanges();
+        }
+
+        private void Create()
+        {
+            CreateFoldoutButton();
+            CreateTestContent();
+            CreateTestDescription();
+            CreateTestMessages();
+        }
+
+        private void CreateFoldoutButton()
+        {
+            _testFoldoutButton = new Button(ToggleExpand) { name = _test.Name };
+            _testFoldoutButton.AddToClassList("validator-test-foldout");
+
+            // Expander and Asset Label
+            VisualElement labelExpanderRow = new VisualElement { name = "labelExpanderRow" };
+            labelExpanderRow.AddToClassList("validator-test-expander");
+
+            _testFoldoutExpandStateLabel = new Label { name = "ExpanderLabel", text = "►" };
+            _testFoldoutExpandStateLabel.AddToClassList("validator-test-expander-arrow");
+
+            _testFoldoutLabel = new Label { name = "TestLabel", text = _test.Name };
+            _testFoldoutLabel.AddToClassList("validator-text-expander-label");
+
+            labelExpanderRow.Add(_testFoldoutExpandStateLabel);
+            labelExpanderRow.Add(_testFoldoutLabel);
+
+            _testStatusImage = new Image
+            {
+                name = "TestImage",
+                image = ValidatorUtility.GetStatusTexture(_test.Result.Status)
+            };
+
+            _testStatusImage.AddToClassList("validator-test-expander-image");
+
+            _testFoldoutButton.Add(labelExpanderRow);
+            _testFoldoutButton.Add(_testStatusImage);
+
+            Add(_testFoldoutButton);
+        }
+
+        private void CreateTestContent()
+        {
+            _testContent = new VisualElement();
+            _testContent.AddToClassList("validator-test-content");
+            Add(_testContent);
+        }
+
+        private void CreateTestDescription()
+        {
+            var testCaseDescription = new TextField
+            {
+                name = "Description",
+                value = _test.Description,
+                isReadOnly = true,
+                multiline = true,
+                focusable = false,
+                doubleClickSelectsWord = false,
+                tripleClickSelectsLine = false
+            };
+            testCaseDescription.AddToClassList("validator-test-content-textfield");
+
+#if UNITY_2022_1_OR_NEWER
+        testCaseDescription.focusable = true;
+        testCaseDescription.selectAllOnFocus = false;
+        testCaseDescription.selectAllOnMouseUp = false;
+#endif
+
+            _testContent.Add(testCaseDescription);
+        }
+
+        private void CreateTestMessages()
+        {
+            if (_test.Result.MessageCount == 0)
+                return;
+
+            _resultMessagesBox = new VisualElement();
+            _resultMessagesBox.AddToClassList("validator-test-content-result-messages");
+
+            switch (_test.Result.Status)
+            {
+                case TestResultStatus.Pass:
+                    _resultMessagesBox.AddToClassList("validator-test-content-result-messages-pass");
+                    break;
+                case TestResultStatus.Warning:
+                    _resultMessagesBox.AddToClassList("validator-test-content-result-messages-warning");
+                    break;
+                case TestResultStatus.Fail:
+                    _resultMessagesBox.AddToClassList("validator-test-content-result-messages-fail");
+                    break;
+            }
+
+            for (int i = 0; i < _test.Result.MessageCount; i++)
+            {
+                _resultMessagesBox.Add(CreateMessage(_test.Result.GetMessage(i)));
+
+                if (i == _test.Result.MessageCount - 1)
+                    continue;
+
+                var separator = new VisualElement() { name = "Separator" };
+                separator.AddToClassList("message-separator");
+                _resultMessagesBox.Add(separator);
+            }
+
+            _testContent.Add(_resultMessagesBox);
+        }
+
+        private VisualElement CreateMessage(TestResultMessage message)
+        {
+            var resultText = message.GetText();
+            var clickAction = message.GetClickAction();
+
+            var resultMessage = new VisualElement { name = "ResultMessageElement" };
+            resultMessage.AddToClassList("validator-test-content-result-messages-content");
+
+            var informationButton = new Button();
+            informationButton.AddToClassList("validator-test-content-result-messages-content-button");
+
+            if (clickAction != null)
+            {
+                informationButton.tooltip = clickAction.Tooltip;
+                informationButton.clicked += clickAction.Execute;
+                informationButton.SetEnabled(true);
+            }
+
+            var informationDescription = new Label { name = "InfoDesc", text = resultText };
+            informationDescription.AddToClassList("validator-test-content-result-messages-content-label");
+
+            informationButton.Add(informationDescription);
+            resultMessage.Add(informationButton);
+
+            for (int i = 0; i < message.MessageObjectCount; i++)
+            {
+                var obj = message.GetMessageObject(i);
+                if (obj == null)
+                    continue;
+
+                if (obj.GetObject() == null)
+                    continue;
+
+                var objectField = new ObjectField() { objectType = obj.GetType(), value = obj.GetObject() };
+                objectField.RegisterCallback<ChangeEvent<UnityEngine.Object>>((evt) =>
+                    objectField.SetValueWithoutNotify(evt.previousValue));
+                resultMessage.Add(objectField);
+            }
+
+            return resultMessage;
+        }
+
+        private void ToggleExpand()
+        {
+            if (!_isExpanded)
+                Expand();
+            else
+                Unexpand();
+        }
+
+        private void Expand()
+        {
+            _testFoldoutExpandStateLabel.text = "▼";
+            _testFoldoutButton.AddToClassList("validator-test-foldout-expanded");
+            _testContent.style.display = DisplayStyle.Flex;
+            _isExpanded = true;
+        }
+
+        private void Unexpand()
+        {
+            _testFoldoutExpandStateLabel.text = "►";
+            _testFoldoutButton.RemoveFromClassList("validator-test-foldout-expanded");
+            _testContent.style.display = DisplayStyle.None;
+            _isExpanded = false;
+        }
+
+        private void SubscribeToSceneChanges()
+        {
+            // Some result message objects only exist in specific scenes,
+            // therefore the UI must be refreshed on scene change
+            var windowToSubscribeTo = Resources.FindObjectsOfTypeAll<ValidatorWindow>().FirstOrDefault();
+            UnityAction<Scene, Scene> sceneChanged = null;
+            sceneChanged = new UnityAction<Scene, Scene>((_, __) => RefreshObjects(windowToSubscribeTo));
+            EditorSceneManager.activeSceneChangedInEditMode += sceneChanged;
+
+            void RefreshObjects(ValidatorWindow subscribedWindow)
+            {
+                // Remove callback if validator window instance changed
+                var activeWindow = Resources.FindObjectsOfTypeAll<ValidatorWindow>().FirstOrDefault();
+                if (subscribedWindow == null || subscribedWindow != activeWindow)
+                {
+                    EditorSceneManager.activeSceneChangedInEditMode -= sceneChanged;
+                    return;
+                }
+
+                if (_resultMessagesBox != null)
+                    _testContent.Remove(_resultMessagesBox);
+
+                CreateTestMessages();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorTestElement.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorTestElement.cs.meta
new file mode 100644
index 0000000..dc3393c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorTestElement.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 56c93e6f23ba5724da8cc38f832be4e0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorTestElement.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorTestGroupElement.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorTestGroupElement.cs
new file mode 100644
index 0000000..03bf031
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorTestGroupElement.cs
@@ -0,0 +1,102 @@
+using AssetStoreTools.Validator.UI.Data;
+using AssetStoreTools.Validator.Utility;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Validator.UI.Elements
+{
+    internal class ValidatorTestGroupElement : VisualElement
+    {
+        // Data
+        private IValidatorTestGroup _group;
+        private bool _isExpanded;
+
+        // UI
+        private Button _groupFoldoutButton;
+        private Label _groupExpandStateLabel;
+        private Label _groupFoldoutLabel;
+        private Image _groupStatusImage;
+
+        private VisualElement _groupContent;
+        private List<ValidatorTestElement> _testElements;
+
+        public ValidatorTestGroupElement(IValidatorTestGroup group)
+        {
+            AddToClassList("validator-test-list-group");
+
+            _group = group;
+
+            Create();
+        }
+
+        private void Create()
+        {
+            CreateGroupFoldout();
+            CreateGroupContent();
+        }
+
+        private void CreateGroupFoldout()
+        {
+            _groupFoldoutButton = new Button(ToggleExpand);
+            _groupFoldoutButton.AddToClassList("validator-test-list-group-expander");
+
+            _groupExpandStateLabel = new Label { name = "ExpanderLabel", text = "►" };
+            _groupExpandStateLabel.AddToClassList("validator-test-list-group-expander-arrow");
+
+            _groupStatusImage = new Image
+            {
+                name = "TestImage",
+                image = ValidatorUtility.GetStatusTexture(_group.Status)
+            };
+            _groupStatusImage.AddToClassList("validator-test-list-group-expander-image");
+
+            _groupFoldoutLabel = new Label() { text = $"{_group.Name} ({_group.Tests.Count()})" };
+            _groupFoldoutLabel.AddToClassList("validator-test-list-group-expander-label");
+
+            _groupFoldoutButton.Add(_groupExpandStateLabel);
+            _groupFoldoutButton.Add(_groupStatusImage);
+            _groupFoldoutButton.Add(_groupFoldoutLabel);
+
+            Add(_groupFoldoutButton);
+        }
+
+        private void CreateGroupContent()
+        {
+            _groupContent = new VisualElement();
+            _groupContent.AddToClassList("validator-test-list-group-content");
+
+            Add(_groupContent);
+
+            _testElements = new List<ValidatorTestElement>();
+            foreach (var test in _group.Tests)
+            {
+                var testElement = new ValidatorTestElement(test);
+                _testElements.Add(testElement);
+                _groupContent.Add(testElement);
+            }
+        }
+
+        private void ToggleExpand()
+        {
+            if (!_isExpanded)
+                Expand();
+            else
+                Unexpand();
+        }
+
+        private void Expand()
+        {
+            _groupExpandStateLabel.text = "▼";
+            _groupContent.style.display = DisplayStyle.Flex;
+            _isExpanded = true;
+        }
+
+        private void Unexpand()
+        {
+            _groupExpandStateLabel.text = "►";
+            _groupContent.style.display = DisplayStyle.None;
+            _isExpanded = false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorTestGroupElement.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorTestGroupElement.cs.meta
new file mode 100644
index 0000000..4006741
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorTestGroupElement.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: d7c7a8788d0ea324e843a475244d8e18
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Elements/ValidatorTestGroupElement.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/ValidatorWindow.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/ValidatorWindow.cs
new file mode 100644
index 0000000..fafb103
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/ValidatorWindow.cs
@@ -0,0 +1,56 @@
+using AssetStoreTools.Utility;
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services;
+using AssetStoreTools.Validator.UI.Views;
+using UnityEditor.UIElements;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Validator.UI
+{
+
+    internal class ValidatorWindow : AssetStoreToolsWindow
+    {
+        protected override string WindowTitle => "Asset Store Validator";
+
+        private ICachingService _cachingService;
+
+        private ValidatorTestsView _validationTestsView;
+
+        protected override void Init()
+        {
+            minSize = new Vector2(350, 350);
+
+            this.SetAntiAliasing(4);
+
+            VisualElement root = rootVisualElement;
+
+            // Clean it out, in case the window gets initialized again
+            root.Clear();
+
+            // Getting a reference to the USS Document and adding stylesheet to the root
+            root.styleSheets.Add(StyleSelector.ValidatorWindow.ValidatorWindowStyle);
+            root.styleSheets.Add(StyleSelector.ValidatorWindow.ValidatorWindowTheme);
+
+            GetServices();
+            ConstructWindow();
+        }
+
+        private void GetServices()
+        {
+            _cachingService = ValidatorServiceProvider.Instance.GetService<ICachingService>();
+        }
+
+        private void ConstructWindow()
+        {
+            _validationTestsView = new ValidatorTestsView(_cachingService);
+            rootVisualElement.Add(_validationTestsView);
+        }
+
+        public void Load(ValidationSettings settings, ValidationResult result)
+        {
+            _validationTestsView.LoadSettings(settings);
+            _validationTestsView.LoadResult(result);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/ValidatorWindow.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/ValidatorWindow.cs.meta
new file mode 100644
index 0000000..e7a381b
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/ValidatorWindow.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: a0dc99b826513dd4f868f1cf405c3923
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/ValidatorWindow.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Views.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Views.meta
new file mode 100644
index 0000000..e90db60
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Views.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8a973656ad14b8941b790ed83c874e97
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Views/ValidatorTestsView.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Views/ValidatorTestsView.cs
new file mode 100644
index 0000000..0b77ff0
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Views/ValidatorTestsView.cs
@@ -0,0 +1,103 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services;
+using AssetStoreTools.Validator.UI.Data;
+using AssetStoreTools.Validator.UI.Data.Serialization;
+using AssetStoreTools.Validator.UI.Elements;
+using UnityEditor;
+using UnityEngine.UIElements;
+
+namespace AssetStoreTools.Validator.UI.Views
+{
+    internal class ValidatorTestsView : VisualElement
+    {
+        // Data
+        private ValidatorStateData _stateData;
+        private IValidatorSettings _settings;
+        private IValidatorResults _results;
+
+        private ICachingService _cachingService;
+
+        // UI
+        private ValidatorSettingsElement _validatorSettingsElement;
+        private ValidatorButtonElement _validatorButtonElement;
+        private ValidatorResultsElement _validationTestListElement;
+
+        public ValidatorTestsView(ICachingService cachingService)
+        {
+            _cachingService = cachingService;
+
+            if (!_cachingService.GetCachedValidatorStateData(out _stateData))
+                _stateData = new ValidatorStateData();
+
+            _settings = new ValidatorSettings(_stateData.GetSettings());
+            _settings.OnRequireSerialize += Serialize;
+
+            _results = new ValidatorResults(_settings, _stateData.GetResults());
+            _results.OnRequireSerialize += Serialize;
+
+            Create();
+        }
+
+        private void Create()
+        {
+            CreateValidatorDescription();
+            CreateValidationSettings();
+            CreateValidationButton();
+            CreateValidatorResults();
+        }
+
+        private void CreateValidatorDescription()
+        {
+            var validationInfoElement = new ValidatorDescriptionElement();
+            Add(validationInfoElement);
+        }
+
+        private void CreateValidationSettings()
+        {
+            _validatorSettingsElement = new ValidatorSettingsElement(_settings);
+            Add(_validatorSettingsElement);
+        }
+
+        private void CreateValidationButton()
+        {
+            _validatorButtonElement = new ValidatorButtonElement(_settings);
+            _validatorButtonElement.OnValidate += Validate;
+            Add(_validatorButtonElement);
+        }
+
+        private void CreateValidatorResults()
+        {
+            _validationTestListElement = new ValidatorResultsElement(_results);
+            Add(_validationTestListElement);
+        }
+
+        private void Validate()
+        {
+            var validator = _settings.CreateValidator();
+            var result = validator.Validate();
+
+            if (result.Status == ValidationStatus.Failed)
+            {
+                EditorUtility.DisplayDialog("Validation failed", result.Exception.Message, "OK");
+                return;
+            }
+
+            LoadResult(result);
+        }
+
+        public void LoadSettings(ValidationSettings settings)
+        {
+            _settings.LoadSettings(settings);
+        }
+
+        public void LoadResult(ValidationResult result)
+        {
+            _results.LoadResult(result);
+        }
+
+        private void Serialize()
+        {
+            _cachingService.CacheValidatorStateData(_stateData);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Views/ValidatorTestsView.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Views/ValidatorTestsView.cs.meta
new file mode 100644
index 0000000..cb6bfb4
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Views/ValidatorTestsView.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: c5e0da39c6638684c9d3faf8e62c60d3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/UI/Views/ValidatorTestsView.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Utility.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Utility.meta
new file mode 100644
index 0000000..148dca9
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Utility.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3bc3a78a4b494e44b75268ad1444ab81
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Utility/ValidatorUtility.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Utility/ValidatorUtility.cs
new file mode 100644
index 0000000..18546ab
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Utility/ValidatorUtility.cs
@@ -0,0 +1,142 @@
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services;
+using AssetStoreTools.Validator.TestDefinitions;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+using static AssetStoreTools.Constants;
+using ValidatorConstants = AssetStoreTools.Constants.Validator;
+
+namespace AssetStoreTools.Validator.Utility
+{
+    internal static class ValidatorUtility
+    {
+        public enum SortType
+        {
+            Id,
+            Alphabetical
+        }
+
+        public static ValidationTestScriptableObject[] GetAutomatedTestCases() => GetAutomatedTestCases(SortType.Id);
+
+        public static ValidationTestScriptableObject[] GetAutomatedTestCases(SortType sortType)
+        {
+            string[] guids = AssetDatabase.FindAssets("t:AutomatedTestScriptableObject", new[] { ValidatorConstants.Tests.TestDefinitionsPath });
+            ValidationTestScriptableObject[] tests = new ValidationTestScriptableObject[guids.Length];
+            for (int i = 0; i < tests.Length; i++)
+            {
+                string testPath = AssetDatabase.GUIDToAssetPath(guids[i]);
+                AutomatedTestScriptableObject test = AssetDatabase.LoadAssetAtPath<AutomatedTestScriptableObject>(testPath);
+
+                tests[i] = test;
+            }
+
+            switch (sortType)
+            {
+                default:
+                case SortType.Id:
+                    tests = tests.Where(x => x != null).OrderBy(x => x.Id).ToArray();
+                    break;
+                case SortType.Alphabetical:
+                    tests = tests.Where(x => x != null).OrderBy(x => x.Title).ToArray();
+                    break;
+            }
+
+            return tests;
+        }
+
+        public static MonoScript GenerateTestScript(string testName, ValidationType validationType)
+        {
+            var derivedType = nameof(ITestScript);
+            var configType = string.Empty;
+            var scriptPath = string.Empty;
+            switch (validationType)
+            {
+                case ValidationType.Generic:
+                    configType = nameof(GenericTestConfig);
+                    scriptPath = ValidatorConstants.Tests.GenericTestMethodsPath;
+                    break;
+                case ValidationType.UnityPackage:
+                    configType = nameof(GenericTestConfig);
+                    scriptPath = ValidatorConstants.Tests.UnityPackageTestMethodsPath;
+                    break;
+                default:
+                    throw new System.Exception("Undefined validation type");
+            }
+
+            var newScriptPath = $"{scriptPath}/{testName}";
+            if (!newScriptPath.EndsWith(".cs"))
+                newScriptPath += ".cs";
+
+            var existingScript = AssetDatabase.LoadAssetAtPath<MonoScript>(newScriptPath);
+            if (existingScript != null)
+                return existingScript;
+
+            var scriptContent =
+                $"using AssetStoreTools.Validator.Data;\n" +
+                $"using AssetStoreTools.Validator.TestDefinitions;\n\n" +
+                $"namespace AssetStoreTools.Validator.TestMethods\n" +
+                $"{{\n" +
+                $"    internal class {testName} : {derivedType}\n" +
+                $"    {{\n" +
+                $"        private {configType} _config;\n\n" +
+                $"        // Constructor also accepts dependency injection of registered {nameof(IValidatorService)} types\n" +
+                $"        public {testName}({configType} config)\n" +
+                $"        {{\n" +
+                $"            _config = config;\n" +
+                $"        }}\n\n" +
+                $"        public {nameof(TestResult)} {nameof(ITestScript.Run)}()\n" +
+                $"        {{\n" +
+                $"            var result = new {nameof(TestResult)}() {{ {nameof(TestResult.Status)} = {nameof(TestResultStatus)}.{nameof(TestResultStatus.Undefined)} }};\n" +
+                $"            return result;\n" +
+                $"        }}\n" +
+                $"    }}\n" +
+                $"}}\n";
+
+            File.WriteAllText(newScriptPath, scriptContent);
+            AssetDatabase.Refresh();
+            return AssetDatabase.LoadAssetAtPath<MonoScript>(newScriptPath);
+        }
+
+        public static string GetLongestProjectPath()
+        {
+            var longPaths = GetProjectPaths(new string[] { "Assets", "Packages" });
+            return longPaths.Aggregate("", (max, cur) => max.Length > cur.Length ? max : cur);
+        }
+
+        public static IEnumerable<string> GetProjectPaths(string[] rootPaths)
+        {
+            var longPaths = new List<string>();
+            var guids = AssetDatabase.FindAssets("*", rootPaths);
+
+            foreach (var guid in guids)
+            {
+                var path = AssetDatabase.GUIDToAssetPath(guid);
+                longPaths.Add(path);
+            }
+
+            return longPaths;
+        }
+
+        public static Texture GetStatusTexture(TestResultStatus status)
+        {
+            var iconTheme = "";
+            if (!EditorGUIUtility.isProSkin)
+                iconTheme = "_d";
+
+            switch (status)
+            {
+                case TestResultStatus.Pass:
+                    return (Texture)EditorGUIUtility.Load($"{WindowStyles.ValidatorIconsPath}/success{iconTheme}.png");
+                case TestResultStatus.Warning:
+                    return (Texture)EditorGUIUtility.Load($"{WindowStyles.ValidatorIconsPath}/warning{iconTheme}.png");
+                case TestResultStatus.Fail:
+                    return (Texture)EditorGUIUtility.Load($"{WindowStyles.ValidatorIconsPath}/error{iconTheme}.png");
+                default:
+                    return (Texture)EditorGUIUtility.Load($"{WindowStyles.ValidatorIconsPath}/undefined{iconTheme}.png");
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Utility/ValidatorUtility.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Utility/ValidatorUtility.cs.meta
new file mode 100644
index 0000000..0c75432
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Utility/ValidatorUtility.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 24792af98b4d87746a4b945e2a45dc2d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/Utility/ValidatorUtility.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/ValidatorBase.cs b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/ValidatorBase.cs
new file mode 100644
index 0000000..afdc986
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/ValidatorBase.cs
@@ -0,0 +1,108 @@
+using AssetStoreTools.Validator.Categories;
+using AssetStoreTools.Validator.Data;
+using AssetStoreTools.Validator.Services;
+using AssetStoreTools.Validator.TestDefinitions;
+using AssetStoreTools.Validator.Utility;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+
+namespace AssetStoreTools.Validator
+{
+    internal abstract class ValidatorBase : IValidator
+    {
+        public ValidationSettings Settings { get; private set; }
+
+        private CategoryEvaluator _categoryEvaluator;
+        private List<AutomatedTest> _automatedTests;
+
+        protected ICachingService CachingService;
+
+        public ValidatorBase(ValidationSettings settings)
+        {
+            Settings = settings;
+            _categoryEvaluator = new CategoryEvaluator(settings?.Category);
+
+            CachingService = ValidatorServiceProvider.Instance.GetService<ICachingService>();
+
+            CreateAutomatedTestCases();
+        }
+
+        private void CreateAutomatedTestCases()
+        {
+            var testData = ValidatorUtility.GetAutomatedTestCases(ValidatorUtility.SortType.Alphabetical);
+            _automatedTests = new List<AutomatedTest>();
+
+            foreach (var t in testData)
+            {
+                var test = new AutomatedTest(t);
+                _automatedTests.Add(test);
+            }
+        }
+
+        protected abstract void ValidateSettings();
+        protected abstract ValidationResult GenerateValidationResult();
+
+        public ValidationResult Validate()
+        {
+            try
+            {
+                ValidateSettings();
+            }
+            catch (Exception e)
+            {
+                return new ValidationResult() { Status = ValidationStatus.Failed, Exception = e };
+            }
+
+            var result = GenerateValidationResult();
+            return result;
+        }
+
+        protected List<AutomatedTest> GetApplicableTests(params ValidationType[] validationTypes)
+        {
+            return _automatedTests.Where(x => validationTypes.Any(y => y == x.ValidationType)).ToList();
+        }
+
+        protected ValidationResult RunTests(List<AutomatedTest> tests, ITestConfig config)
+        {
+            var completedTests = new List<AutomatedTest>();
+
+            for (int i = 0; i < tests.Count; i++)
+            {
+                var test = tests[i];
+
+                EditorUtility.DisplayProgressBar("Validating", $"Running validation: {i + 1} - {test.Title}", (float)i / _automatedTests.Count);
+
+                test.Run(config);
+
+                // Adjust result based on categories
+                var updatedStatus = _categoryEvaluator.Evaluate(test);
+                test.Result.Status = updatedStatus;
+
+                // Add the result
+                completedTests.Add(test);
+
+#if AB_BUILDER
+                EditorUtility.UnloadUnusedAssetsImmediate();
+#endif
+            }
+
+            EditorUtility.UnloadUnusedAssetsImmediate();
+            EditorUtility.ClearProgressBar();
+
+            var projectPath = Application.dataPath.Substring(0, Application.dataPath.Length - "/Assets".Length);
+            var hasCompilationErrors = EditorUtility.scriptCompilationFailed;
+            var result = new ValidationResult()
+            {
+                Status = ValidationStatus.RanToCompletion,
+                Tests = completedTests,
+                ProjectPath = projectPath,
+                HadCompilationErrors = hasCompilationErrors
+            };
+
+            return result;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/ValidatorBase.cs.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/ValidatorBase.cs.meta
new file mode 100644
index 0000000..a1f39f0
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/ValidatorBase.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 2360246050affaa458413c6569c1f925
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Scripts/ValidatorBase.cs
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Styles.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Styles.meta
new file mode 100644
index 0000000..a5cbef6
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Styles.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 21f473cb130d5f0458b2823b3a67f789
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Styles/Style.uss b/Packages/com.unity.asset-store-tools/Editor/Validator/Styles/Style.uss
new file mode 100644
index 0000000..b4a4022
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Styles/Style.uss
@@ -0,0 +1,337 @@
+/* Validator Description */
+
+.validator-description {
+	flex-direction: column;
+    flex-shrink: 0;
+
+    margin: 10px 5px 2px 5px;
+    padding: 2px 4px;
+}
+
+.validator-description-simple-container {
+    flex-direction: column;
+    flex-wrap: wrap;
+}
+
+.validator-description-simple-label {
+    white-space: normal;
+}
+
+.validator-description-full-container {
+    margin-top: 12px;
+}
+
+.validator-description-full-label {
+    white-space: normal;
+    margin-bottom: 10px;
+}
+
+.validator-description-hyperlink-button {
+    margin: 0;
+    padding: 0;
+    
+    align-self: flex-start;
+    cursor: link;
+}
+
+.validator-description-show-button {
+    margin-top: 12px;
+}
+
+.validator-description-hide-button {
+    margin-top: 12px;
+}
+
+/* Validator Settings */
+
+.validator-settings {
+    flex-direction: column;
+    flex-shrink: 0;
+
+    margin: 0px 5px 2px 5px;
+    padding: 2px 4px;
+}
+
+.validator-settings-selection-row {
+    flex-direction: row;
+    flex-grow: 1;
+    
+    margin-top: 10px;
+    padding: 0 3px 0 2px;
+}
+
+.validator-settings-selection-label-help-row {
+    flex-direction: row;
+    flex-shrink: 1;
+    flex-grow: 0;
+
+    align-self: center;
+    align-items: center;
+    justify-content: flex-start;
+
+    width: 120px;
+}
+
+.validator-settings-selection-label-help-row > Label {
+    -unity-font-style: bold;
+}
+
+.validator-settings-selection-label-help-row > Image {
+    height: 16px;
+    width: 16px;
+}
+
+.validator-settings-selection-dropdown {
+    flex-grow: 1;
+    flex-shrink: 1;
+
+    align-self: stretch;
+
+    margin-right: 0;
+    margin-left: 3px;
+    padding: 1px 4px;
+}
+
+/* Validate Button */
+
+.validator-validate-button {
+    align-self: stretch;
+    
+    height: 25px;
+    margin-left: 2px;
+}
+
+/* Validation Paths */
+
+.validator-paths {
+    flex-direction: column;
+    flex-grow: 1;
+    flex-shrink: 0;
+    
+    margin-bottom: 10px;
+    padding: 0;
+}
+
+.validator-paths-box {
+    flex-grow: 1;
+    flex-direction: column;
+}
+
+.validator-paths-scroll-view {
+    flex-grow: 1;
+    height: 100px;
+    margin-left: 3px;
+}
+
+.validator-paths-scroll-view > .unity-scroll-view__content-viewport
+{
+    margin-left: 1px;
+}
+
+.validator-paths-scroll-view > * > .unity-scroll-view__content-container
+{
+    padding: 0 0 0 0;
+}
+
+.validator-paths-scroll-view > * > .unity-scroll-view__vertical-scroller
+{
+    margin: -1px 0;
+}
+
+.validator-paths-scroll-view-bottom-row {
+    flex-direction: row-reverse;
+    margin: -1px 0 0 3px;
+}
+
+.validator-paths-add-button {
+    margin: 3px 0 0 0;
+    align-self: center;
+}
+
+.validator-paths-path-row {
+    flex-direction: row;
+    flex-grow: 1;
+
+    margin-top: 2px;
+    padding: 0 5px 0 2px;
+}
+
+.validator-paths-path-row-input-field {
+    flex-grow: 1;
+    flex-shrink: 1;
+
+    padding-left: 5px;
+
+    white-space: normal;
+    -unity-text-align: middle-left;
+}
+
+.validator-paths-path-row-remove-button {
+    width: 20px;
+    height: 20px;
+    margin-left: 2px;
+    margin-right: 1px;
+    padding: 1px 0 0 0;
+}
+
+/* Tests List & Groups */
+
+.validator-test-list {
+    flex-grow: 1;
+    flex-shrink: 1;
+}
+
+.validator-test-list-group-separator {
+    height: 2px;
+    margin: 5px 15px;
+}
+
+.validator-test-list-group {
+    overflow: hidden;
+}
+
+.validator-test-list-group-expander {
+    flex-direction: row;
+    flex-grow: 0;
+    flex-shrink: 0;
+
+    align-items: center;
+
+    min-width: 200px;
+    min-height: 30px;
+
+    margin: 10px -1px 2px -1px;
+}
+
+.validator-test-list-group-expander-arrow {
+    align-self: center;
+
+    width: 30px;
+    height: 30px;
+    
+    margin: 0;
+    padding: 0;
+}
+
+.validator-test-list-group-expander-image {
+    flex-shrink: 0;
+    flex-grow: 0;
+
+    width: 17px;
+    height: 17px;
+
+    margin: 0 7px 0 2px;
+}
+
+.validator-test-list-group-expander-label {
+    font-size: 14px;
+}
+
+.validator-test-list-group-content {
+    margin: -2px -2px -2px -2px;
+}
+
+/* Validation Test */
+
+.validator-test {
+    flex-direction: column;
+    flex-shrink: 0;
+    flex-grow: 0;
+
+    padding: 2px 0;
+}
+
+.validator-test-foldout {
+    flex-direction: row;
+    flex-grow: 1;
+    flex-shrink: 1;
+
+    align-items: center;
+    justify-content: space-between;
+
+    min-width: 200px;
+    min-height: 35px;
+
+    margin: 0;
+    padding: 5px 10px;
+}
+
+.validator-test-expander {
+    flex-direction: row;
+    flex-grow: 1;
+}
+
+.validator-test-expander-arrow {
+    font-size: 11px;
+    align-self: center;
+
+    width: 30px;
+    height: 30px;
+    
+    margin: 0;
+    padding: 0;
+}
+
+.validator-text-expander-label {
+    flex-grow: 1;
+    flex-shrink: 1;
+
+    -unity-text-align: middle-left;
+    -unity-font-style: bold;
+    white-space: normal;
+}
+
+.validator-test-expander-image {
+    flex-shrink: 0;
+    
+    width: 14px;
+    height: 14px;
+    
+    margin: 0 10px;
+}
+
+.validator-test-content {
+    flex-grow: 1;
+    flex-shrink: 0;
+
+    margin: 0;
+    padding: 5px 30px;
+}
+
+.validator-test-content-textfield {
+    white-space: normal;
+}
+
+.validator-test-content-result-messages {
+    flex-direction: column;
+    flex-shrink: 0;
+    flex-grow: 0;
+
+    margin: 10px 0 5px 0;
+    padding: 0 3px 3px 3px;
+}
+
+.validator-test-content-result-messages-content {
+    flex-basis: auto;
+    flex-direction: column;
+    
+    margin-top: 3px;
+}
+
+.validator-test-content-result-messages-content-button {
+    align-self: stretch;
+    
+    -unity-font-style: normal;
+    -unity-text-align: middle-left;
+
+    margin: 0;
+}
+
+.validator-test-content-result-messages-content-label {
+    white-space: normal;
+}
+
+.validator-test-content-result-messages-separator {
+    height: 3px;
+    margin: 5px -3px 0 -3px;
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Styles/Style.uss.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Styles/Style.uss.meta
new file mode 100644
index 0000000..344d5f6
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Styles/Style.uss.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 2c67a10c292c653428af654599fc15aa
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Styles/Style.uss
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Styles/ThemeDark.uss b/Packages/com.unity.asset-store-tools/Editor/Validator/Styles/ThemeDark.uss
new file mode 100644
index 0000000..79441e9
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Styles/ThemeDark.uss
@@ -0,0 +1,166 @@
+.primary-colors
+{
+    /* Light - lighter */
+    background-color: rgb(220, 220, 220);
+    /* Light - middle */
+    background-color: rgb(200, 200, 200);
+    /* Light - darker */
+    background-color: rgb(180, 180, 180);
+
+    /* Dark - lighter */
+    background-color: rgb(78, 78, 78);
+    /* Dark - middle */
+    background-color: rgb(68, 68, 68);
+    /* Dark - darker */
+    background-color: rgb(58, 58, 58);
+
+    /* Border color - light */
+    border-color: rgb(200, 200, 200);
+    /* Border color - dark */
+    border-color: rgb(33, 33, 33);
+}
+
+/* Validator Description */
+
+.validator-description-hyperlink-button {
+    color: rgb(68, 113, 229);
+    border-width: 0;
+    background-color: rgba(0, 0, 0, 0);
+}
+
+.validator-description-hyperlink-button:hover {
+    color: rgb(68, 133, 229);
+}
+
+.validator-description-hyperlink-button:active {
+    color: rgb(68, 93, 229);
+}
+
+/* Validator Settings */
+
+.validator-settings-selection-label-help-row > Image {
+    --unity-image: resource("d__Help@2x");
+}
+
+.validator-settings-selection-dropdown {
+    color: rgb(238, 238, 238);
+    background-color: rgb(88, 88, 88);
+
+    border-width: 1px;
+    border-radius: 3px;
+    border-color: rgb(36, 36, 36);
+}
+
+/* Validation Paths */
+
+.validator-paths-scroll-view {
+    border-width: 1px;
+    border-color: rgb(33, 33, 33);
+    background-color: rgb(58, 58, 58);
+}
+
+.validator-paths-scroll-view > * > .unity-scroll-view__vertical-scroller {
+    border-right-width: 0;
+}
+
+.validator-paths-path-row-input-field:hover {
+    background-color: rgb(78, 78, 78);
+}
+
+/* Tests List & Groups */
+
+.validator-test-list {
+    flex-grow: 1;
+    flex-shrink: 1;
+}
+
+.validator-test-list-group-separator {
+    background-color: rgb(104, 104, 104);
+}
+
+.validator-test-list-group-expander {
+    border-width: 0;
+    border-color: rgba(0, 0, 0, 0);
+
+    background-color: rgba(0, 0, 0, 0);
+}
+
+.validator-test-list-group-expander-arrow {
+    color: rgb(104, 104, 104);
+}
+
+.validator-test-list-group-expander-label {
+    color: rgb(255, 255, 255);
+    -unity-font-style: bold;
+}
+
+/* Validation Test */
+
+.validator-test-foldout {
+    border-width: 0;
+    border-radius: 0;
+    background-color: rgb(56, 56, 56);
+}
+
+.validator-test-foldout:hover {
+    background-color: rgb(68, 68, 68);
+}
+
+.validator-test-foldout:active {
+    background-color: rgb(48, 48, 48);
+}
+
+.validator-test-foldout-expanded {
+    background-color: rgb(68, 68, 68);
+}
+
+.validator-test-expander-arrow {
+    color: rgb(104, 104, 104);
+}
+
+.validator-test-content {
+    background-color: rgb(68, 68, 68);
+}
+
+.validator-test-content-textfield > .unity-base-field__input {
+    border-width: 0;
+    border-color: rgba(0, 0, 0, 0);
+    background-color: rgba(0, 0, 0, 0);
+}
+
+.validator-test-content-result-messages {
+    border-left-width: 2px;
+    border-color: rgb(33, 33, 33);
+    background-color: rgb(58, 58, 58);
+}
+
+.validator-test-content-result-messages-pass {
+    border-color: rgb(40, 200, 40);
+}
+
+.validator-test-content-result-messages-warning {
+    border-color: rgb(200, 140, 40);
+}
+
+.validator-test-content-result-messages-fail {
+    border-color: rgb(200, 40, 40);
+}
+
+.validator-test-content-result-messages-content-button {
+    border-width: 0;
+    border-radius: 0;
+    
+    background-color: rgba(0, 0, 0, 0);
+}
+
+.validator-test-content-result-messages-content-button:hover {
+    background-color: rgb(78, 78, 78);
+}
+
+.validator-test-content-result-messages-content-button:active {
+    background-color: rgba(0, 0, 0, 0);
+}
+
+.validator-test-content-result-messages-separator {
+    background-color: rgb(68, 68, 68);
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Styles/ThemeDark.uss.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Styles/ThemeDark.uss.meta
new file mode 100644
index 0000000..5c5344d
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Styles/ThemeDark.uss.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: d09164f0be2befd40aac764571737ff7
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Styles/ThemeDark.uss
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Styles/ThemeLight.uss b/Packages/com.unity.asset-store-tools/Editor/Validator/Styles/ThemeLight.uss
new file mode 100644
index 0000000..e2c05b4
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Styles/ThemeLight.uss
@@ -0,0 +1,166 @@
+.primary-colors
+{
+    /* Light - lighter */
+    background-color: rgb(220, 220, 220);
+    /* Light - middle */
+    background-color: rgb(200, 200, 200);
+    /* Light - darker */
+    background-color: rgb(180, 180, 180);
+
+    /* Dark - lighter */
+    background-color: rgb(50, 50, 50);
+    /* Dark - middle */
+    background-color: rgb(28, 28, 28);
+    /* Dark - darker */
+    background-color: rgb(0, 0, 0);
+
+    /* Border color - light */
+    border-color: rgb(200, 200, 200);
+    /* Border color - dark */
+    border-color: rgb(33, 33, 33);
+}
+
+/* Validator Description */
+
+.validator-description-hyperlink-button {
+    color: rgb(68, 113, 229);
+    border-width: 0;
+    background-color: rgba(0, 0, 0, 0);
+}
+
+.validator-description-hyperlink-button:hover {
+    color: rgb(68, 133, 229);
+}
+
+.validator-description-hyperlink-button:active {
+    color: rgb(68, 93, 229);
+}
+
+/* Validator Settings */
+
+.validator-settings-selection-label-help-row > Image {
+    --unity-image: resource("_Help@2x");
+}
+
+.validator-settings-selection-dropdown {
+    color: rgb(9, 9, 9);
+    background-color: rgb(228, 228, 228);
+
+    border-width: 1px;
+    border-radius: 3px;
+    border-color: rgb(178, 178, 178);
+}
+
+/* Validation Paths */
+
+.validator-paths-scroll-view {
+    border-width: 1px;
+    border-color: rgb(33, 33, 33);
+    background-color: rgb(180, 180, 180);
+}
+
+.validator-paths-scroll-view > * > .unity-scroll-view__vertical-scroller {
+    border-right-width: 0;
+}
+
+.validator-paths-path-row-input-field:hover {
+    background-color: rgb(200, 200, 200);
+}
+
+/* Tests List & Groups */
+
+.validator-test-list {
+    flex-grow: 1;
+    flex-shrink: 1;
+}
+
+.validator-test-list-group-separator {
+    background-color: rgb(77, 77, 77);
+}
+
+.validator-test-list-group-expander {
+    border-width: 0;
+    border-color: rgba(0, 0, 0, 0);
+
+    background-color: rgba(0, 0, 0, 0);
+}
+
+.validator-test-list-group-expander-arrow {
+    color: rgb(77, 77, 77);
+}
+
+.validator-test-list-group-expander-label {
+    color: rgb(48, 48, 48);
+    -unity-font-style: bold;
+}
+
+/* Validation Test */
+
+.validator-test-foldout {
+    border-width: 0;
+    border-radius: 0;
+    background-color: rgb(198, 198, 198);
+}
+
+.validator-test-foldout:hover {
+    background-color: rgb(212, 212, 212);
+}
+
+.validator-test-foldout:active {
+    background-color: rgb(180, 180, 180);
+}
+
+.validator-test-foldout-expanded {
+    background-color: rgb(212, 212, 212);
+}
+
+.validator-test-expander-arrow {
+    color: rgb(77, 77, 77);
+}
+
+.validator-test-content {
+    background-color: rgb(212, 212, 212);
+}
+
+.validator-test-content-textfield > .unity-base-field__input {
+    border-width: 0;
+    border-color: rgba(0, 0, 0, 0);
+    background-color: rgba(0, 0, 0, 0);
+}
+
+.validator-test-content-result-messages {
+    border-left-width: 2px;
+    border-color: rgb(33, 33, 33);
+    background-color: rgb(198, 198, 198);
+}
+
+.validator-test-content-result-messages-pass {
+    border-color: rgb(40, 200, 40);
+}
+
+.validator-test-content-result-messages-warning {
+    border-color: rgb(200, 140, 40);
+}
+
+.validator-test-content-result-messages-fail {
+    border-color: rgb(200, 40, 40);
+}
+
+.validator-test-content-result-messages-content-button {
+    border-width: 0;
+    border-radius: 0;
+    
+    background-color: rgba(0, 0, 0, 0);
+}
+
+.validator-test-content-result-messages-content-button:hover {
+    background-color: rgb(212, 212, 212);
+}
+
+.validator-test-content-result-messages-content-button:active {
+    background-color: rgba(0, 0, 0, 0);
+}
+
+.validator-test-content-result-messages-separator {
+    background-color: rgb(212, 212, 212);
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Styles/ThemeLight.uss.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Styles/ThemeLight.uss.meta
new file mode 100644
index 0000000..e2acc31
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Styles/ThemeLight.uss.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 7404a65e6f9592846a20fd5190b12b1a
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Styles/ThemeLight.uss
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests.meta
new file mode 100644
index 0000000..4515443
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 82d68ee644bbbb44183019f731e9f205
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic.meta
new file mode 100644
index 0000000..e10e15e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 38036e7f211469848b7cf706e3a1febf
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Animation Clips.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Animation Clips.asset
new file mode 100644
index 0000000..c9b418f
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Animation Clips.asset	
@@ -0,0 +1,27 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Check Animation Clips
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 31
+  Title: Check Animation Clips
+  Description: Animation Clips should not have the default name 'Take 001'. This
+    could lead to confusion when filtering assets by animation clips.
+  CategoryInfo:
+    IsFailFilter: 0
+    IsInclusiveFilter: 0
+    AppliesToSubCategories: 1
+    Filter:
+    - Animation
+  ValidationType: 0
+  TestScript: {fileID: 11500000, guid: 7a28985886f182c4bacc89a44777c742, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Animation Clips.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Animation Clips.asset.meta
new file mode 100644
index 0000000..23653ab
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Animation Clips.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: e0426dd01b5136a4ca1d42d312e12fad
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check
+    Animation Clips.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Audio Clipping.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Audio Clipping.asset
new file mode 100644
index 0000000..356c3ae
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Audio Clipping.asset	
@@ -0,0 +1,32 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Check Audio Clipping
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 27
+  Title: Check Audio Clipping
+  Description: 'Audio files should not peak above the defined dB threshold of -0.3db
+
+
+    Please
+    note that lossless audio files that are imported into Unity with their Compression
+    Format set to anything other than PCM can still fail the Validator. If such cases
+    arise, please export your audio files with extra headroom, or set the Compression
+    Format to PCM if applicable.'
+  CategoryInfo:
+    IsFailFilter: 1
+    IsInclusiveFilter: 1
+    AppliesToSubCategories: 1
+    Filter:
+    - Audio
+  TestScript: {fileID: 11500000, guid: f604db0353da0cb46bb048f5cd37186f, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Audio Clipping.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Audio Clipping.asset.meta
new file mode 100644
index 0000000..d60afa9
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Audio Clipping.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: 03c6cd398931b3e41b0784e8589e153f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check
+    Audio Clipping.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Colliders.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Colliders.asset
new file mode 100644
index 0000000..079d75b
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Colliders.asset	
@@ -0,0 +1,26 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Check Colliders
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 4
+  Title: Check Colliders
+  Description: Prefabs with meshes inside them have to have colliders applied to
+    them, if the Prefabs are marked as Static. Please make sure you have appropriately
+    sized colliders applied to your prefabs.
+  CategoryInfo:
+    IsFailFilter: 1
+    IsInclusiveFilter: 1
+    AppliesToSubCategories: 1
+    Filter: []
+  TestScript: {fileID: 11500000, guid: 308b3d7b7a883b949a14f47cfd5c7ebe, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Colliders.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Colliders.asset.meta
new file mode 100644
index 0000000..01c62f2
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Colliders.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: 28ab5af444cf3c849800ed0d8f4a3102
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check
+    Colliders.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Compressed Files.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Compressed Files.asset
new file mode 100644
index 0000000..f8aa71f
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Compressed Files.asset	
@@ -0,0 +1,31 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Check Compressed Files
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 22
+  Title: Check Compressed Files
+  Description: "Package should not contain nested .unitypackage or archive files
+    that obscure most of, or the entirety of the content.\n\n.unitypackage files
+    are acceptable for including setup preferences, settings, supplemental files
+    for other Asset Store products, or alternative render pipeline content\n\n.zip
+    files are acceptable if they are compressing files that do not natively function
+    in the Unity Editor. (For example, Blender, HTML Documentation, or Visual Studio
+    Projects). Such files should include 'source' in the file name (e.g. \"Blender_source.zip\"
+    or \"PSDSource.zip\")."
+  CategoryInfo:
+    IsFailFilter: 1
+    IsInclusiveFilter: 1
+    AppliesToSubCategories: 1
+    Filter: []
+  TestScript: {fileID: 11500000, guid: 84b23febe0d923842aef73b95da5f25b, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Compressed Files.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Compressed Files.asset.meta
new file mode 100644
index 0000000..47a8d65
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Compressed Files.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: 53189e6e51235b14192c4d5b3145dd27
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check
+    Compressed Files.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Empty Prefabs.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Empty Prefabs.asset
new file mode 100644
index 0000000..6154efa
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Empty Prefabs.asset	
@@ -0,0 +1,31 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Check Empty Prefabs
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 5
+  Title: Check Empty Prefabs
+  Description: Prefabs cannot be empty, please make sure that you set up your prefabs.
+    correctly.
+  CategoryInfo:
+    IsFailFilter: 1
+    IsInclusiveFilter: 1
+    AppliesToSubCategories: 1
+    Filter:
+    - 2D
+    - 3D
+    - Animation
+    - Essentials
+    - Templates
+    - VFX
+  TestScript: {fileID: 11500000, guid: 8055bed9373283e4793463b90b42f08f, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Empty Prefabs.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Empty Prefabs.asset.meta
new file mode 100644
index 0000000..6add073
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Empty Prefabs.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: 08790ea0ed0fd274fb1df75ccc32d415
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check
+    Empty Prefabs.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check File Menu Names.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check File Menu Names.asset
new file mode 100644
index 0000000..ff0f7a4
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check File Menu Names.asset	
@@ -0,0 +1,26 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Check File Menu Names
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 21
+  Title: Check File Menu Names
+  Description: File menus should be placed under an existing menu, such as "Window/<PackageName>".
+    If no existing menus are a good fit, they should be placed under a custom menu
+    called "Tools".
+  CategoryInfo:
+    IsFailFilter: 1
+    IsInclusiveFilter: 1
+    AppliesToSubCategories: 1
+    Filter: []
+  TestScript: {fileID: 11500000, guid: d8e3b12ecc1fcd74d9a9f8d2b549fc63, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check File Menu Names.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check File Menu Names.asset.meta
new file mode 100644
index 0000000..d3c997f
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check File Menu Names.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: eaf232919893db04b8e05e91f6815424
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check
+    File Menu Names.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check LODs.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check LODs.asset
new file mode 100644
index 0000000..2b332d7
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check LODs.asset	
@@ -0,0 +1,33 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Check LODs
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 17
+  Title: Check LODs
+  Description: 'Prefabs containing meshes with ''LOD'' in their name must meet the
+    following requirements:
+
+    - LOD Mesh must be referenced by an LOD Group Component
+
+    -
+    LOD Mesh GameObject must be a child of an LOD Group Component.'
+  CategoryInfo:
+    IsFailFilter: 1
+    IsInclusiveFilter: 1
+    AppliesToSubCategories: 1
+    Filter:
+    - 3D
+    - Essentials
+    - Templates
+  TestScript: {fileID: 11500000, guid: 43b2158602f87704fa7b91561cfc8678, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check LODs.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check LODs.asset.meta
new file mode 100644
index 0000000..56caee2
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check LODs.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: ad52ffa05767e9d4bb4d92093ad68b03
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check
+    LODs.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Line Endings.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Line Endings.asset
new file mode 100644
index 0000000..08e9426
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Line Endings.asset	
@@ -0,0 +1,26 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Check Line Endings
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 20
+  Title: Check Line Endings
+  Description: Inconsistent line endings in scripts might lead to incorrect line
+    numbers in stacktraces and compiler errors. Many text editors can fix this using
+    Convert Line Endings menu commands.
+  CategoryInfo:
+    IsFailFilter: 1
+    IsInclusiveFilter: 1
+    AppliesToSubCategories: 1
+    Filter: []
+  TestScript: {fileID: 11500000, guid: 85885005d1c594f42826de3555e98365, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Line Endings.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Line Endings.asset.meta
new file mode 100644
index 0000000..268b809
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Line Endings.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: 1e7b5480c1d8bda43ab4fa945939e243
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check
+    Line Endings.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Mesh Prefabs.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Mesh Prefabs.asset
new file mode 100644
index 0000000..3d8a99a
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Mesh Prefabs.asset	
@@ -0,0 +1,26 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Check Mesh Prefabs
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 2
+  Title: Check Mesh Prefabs
+  Description: Each mesh should have a corresponding prefab set up with all variations
+    of the texture/mesh/material that you are providing. Please create prefabs for
+    all of your imported objects.
+  CategoryInfo:
+    IsFailFilter: 1
+    IsInclusiveFilter: 1
+    AppliesToSubCategories: 1
+    Filter: []
+  TestScript: {fileID: 11500000, guid: 3c3d0d642ac6a6a48aa124a93dae3734, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Mesh Prefabs.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Mesh Prefabs.asset.meta
new file mode 100644
index 0000000..266cf68
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Mesh Prefabs.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: 03b362b67028eb443b7ba8b84aedd5f2
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check
+    Mesh Prefabs.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Missing Components in Assets.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Missing Components in Assets.asset
new file mode 100644
index 0000000..0a69e35
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Missing Components in Assets.asset	
@@ -0,0 +1,25 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Check Missing Components in Assets
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 9
+  Title: Check Missing Components in Assets
+  Description: We do not allow missing or broken material/texture/prefab/script connections
+    in your package. Please make sure none of your assets have missing components.
+  CategoryInfo:
+    IsFailFilter: 1
+    IsInclusiveFilter: 1
+    AppliesToSubCategories: 1
+    Filter: []
+  TestScript: {fileID: 11500000, guid: 22d8f814e2363e34ea220736a4042728, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Missing Components in Assets.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Missing Components in Assets.asset.meta
new file mode 100644
index 0000000..ac6dbc2
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Missing Components in Assets.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: 1a3d0b3827fc16347867bee335e8f4ea
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check
+    Missing Components in Assets.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Missing Components in Scenes.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Missing Components in Scenes.asset
new file mode 100644
index 0000000..f5ecb1a
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Missing Components in Scenes.asset	
@@ -0,0 +1,25 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Check Missing Components in Scenes
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 10
+  Title: Check Missing Components in Scenes
+  Description: We do not allow missing or broken material/texture/prefab/script connections
+    in your package. Please make sure none of your scene objects have missing components.
+  CategoryInfo:
+    IsFailFilter: 1
+    IsInclusiveFilter: 1
+    AppliesToSubCategories: 1
+    Filter: []
+  TestScript: {fileID: 11500000, guid: 511e76d0ebcb23d40a7b49dda0e2980f, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Missing Components in Scenes.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Missing Components in Scenes.asset.meta
new file mode 100644
index 0000000..31f0f0a
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Missing Components in Scenes.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: bc2cb4e6635aa334ea4a52e2e3ce57c8
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check
+    Missing Components in Scenes.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Model Import Logs.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Model Import Logs.asset
new file mode 100644
index 0000000..f5d9b0f
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Model Import Logs.asset	
@@ -0,0 +1,26 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Check Model Import Logs
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 32
+  Title: Check Model Import Logs
+  Description: Model assets should work without issues. Please make sure that there
+    are no errors or warnings when these models are imported.
+  CategoryInfo:
+    IsFailFilter: 1
+    IsInclusiveFilter: 1
+    AppliesToSubCategories: 1
+    Filter: []
+  ValidationType: 0
+  TestScript: {fileID: 11500000, guid: 98f3ec209166855408eaf4abe5bff591, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Model Import Logs.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Model Import Logs.asset.meta
new file mode 100644
index 0000000..9e8b2e6
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Model Import Logs.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: c889cdd91c2f41941a14363dad7a1a38
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check
+    Model Import Logs.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Model Orientation.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Model Orientation.asset
new file mode 100644
index 0000000..dfd8345
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Model Orientation.asset	
@@ -0,0 +1,25 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Check Model Orientation
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 7
+  Title: Check Model Orientation
+  Description: 'Meshes should be facing the correct way. The proper facing is: Z
+    vector is forward, Y vector is up, X vector is right.'
+  CategoryInfo:
+    IsFailFilter: 1
+    IsInclusiveFilter: 1
+    AppliesToSubCategories: 1
+    Filter: []
+  TestScript: {fileID: 11500000, guid: 56cdcdc41a80fbc46b5b2b83ec8d66d7, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Model Orientation.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Model Orientation.asset.meta
new file mode 100644
index 0000000..2a8546f
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Model Orientation.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: 45b2b11da67e8864aacc62d928524b4c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check
+    Model Orientation.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Model Types.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Model Types.asset
new file mode 100644
index 0000000..e9c9aac
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Model Types.asset	
@@ -0,0 +1,24 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Check Model Types
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 23
+  Title: Check Model Types
+  Description: Mesh assets must be either .fbx, .dae, .abc, or .obj file types.
+  CategoryInfo:
+    IsFailFilter: 0
+    IsInclusiveFilter: 1
+    AppliesToSubCategories: 1
+    Filter: []
+  TestScript: {fileID: 11500000, guid: 428b1fb838e6f5a469bbfd26ca3fbfd2, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Model Types.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Model Types.asset.meta
new file mode 100644
index 0000000..07da794
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Model Types.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: ffef800a102b0e04cae1a3b98549ef1b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check
+    Model Types.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Normal Map Textures.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Normal Map Textures.asset
new file mode 100644
index 0000000..2f65269
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Normal Map Textures.asset	
@@ -0,0 +1,25 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Check Normal Map Textures
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 26
+  Title: Check Normal Map Textures
+  Description: Textures that are assigned to Materials as Normal Maps should have
+    their import Texture Type set to 'Normal Map'
+  CategoryInfo:
+    IsFailFilter: 0
+    IsInclusiveFilter: 1
+    AppliesToSubCategories: 1
+    Filter: []
+  TestScript: {fileID: 11500000, guid: d55cea510248f814eb2194c2b53f88d2, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Normal Map Textures.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Normal Map Textures.asset.meta
new file mode 100644
index 0000000..bd5f081
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Normal Map Textures.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: 241ad0174fcadb64da867011d196acbb
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check
+    Normal Map Textures.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Package Naming.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Package Naming.asset
new file mode 100644
index 0000000..5c34623
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Package Naming.asset	
@@ -0,0 +1,30 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Check Package Naming
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 33
+  Title: Check Package Naming
+  Description: Your package and its contents should be named appropriately and not
+    artificially force themselves up the hierarchy within commonly used project folders.
+    This can happen when a file or a folder name starts with a special character
+    (such as an underscore).
+  CategoryInfo:
+    IsFailFilter: 1
+    IsInclusiveFilter: 0
+    AppliesToSubCategories: 1
+    Filter:
+    - Essentials
+    - Templates
+  ValidationType: 0
+  TestScript: {fileID: 11500000, guid: afe9e04825c7d904981a54404b222290, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Package Naming.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Package Naming.asset.meta
new file mode 100644
index 0000000..4cfa90e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Package Naming.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: 04098aa074d151b4a908dfa79dfddec3
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check
+    Package Naming.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Particle Systems.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Particle Systems.asset
new file mode 100644
index 0000000..62d55cd
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Particle Systems.asset	
@@ -0,0 +1,25 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Check Particle Systems
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 25
+  Title: Check Particle Systems
+  Description: All Particle Systems should be saved as Prefabs
+  CategoryInfo:
+    IsFailFilter: 1
+    IsInclusiveFilter: 1
+    AppliesToSubCategories: 1
+    Filter:
+    - VFX
+  TestScript: {fileID: 11500000, guid: 6a623f7988c75884bb17b169ccd3e993, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Particle Systems.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Particle Systems.asset.meta
new file mode 100644
index 0000000..7120a20
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Particle Systems.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: 87da7eaed3cee0d4b8ada0b500e3a958
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check
+    Particle Systems.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Path Lengths.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Path Lengths.asset
new file mode 100644
index 0000000..676ae48
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Path Lengths.asset	
@@ -0,0 +1,25 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Check Path Lengths
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 28
+  Title: Check Path Lengths
+  Description: Package content file paths should not be excessively lengthened. File
+    paths for assets must be under 140 characters
+  CategoryInfo:
+    IsFailFilter: 1
+    IsInclusiveFilter: 1
+    AppliesToSubCategories: 1
+    Filter: []
+  TestScript: {fileID: 11500000, guid: ae379305e9165e84584373a8272c09e7, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Path Lengths.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Path Lengths.asset.meta
new file mode 100644
index 0000000..3a1b4cb
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Path Lengths.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: 21f8ec0602ffac045b1f4a93f8a9b555
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check
+    Path Lengths.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Prefab Transforms.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Prefab Transforms.asset
new file mode 100644
index 0000000..2cf336b
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Prefab Transforms.asset	
@@ -0,0 +1,28 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Check Prefab Transforms
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 3
+  Title: Check Prefab Transforms
+  Description: Prefabs must have their position/rotation set to 0, and their scale
+    set to 1.
+  CategoryInfo:
+    IsFailFilter: 1
+    IsInclusiveFilter: 1
+    AppliesToSubCategories: 1
+    Filter:
+    - 3D
+    - Essentials
+    - Templates
+  TestScript: {fileID: 11500000, guid: f712c17a60bf2d049a4e61c8f79e56c2, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Prefab Transforms.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Prefab Transforms.asset.meta
new file mode 100644
index 0000000..0c1957d
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Prefab Transforms.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: 700026f446833f649a3c63b33a90a295
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check
+    Prefab Transforms.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Script Compilation.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Script Compilation.asset
new file mode 100644
index 0000000..fae309f
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Script Compilation.asset	
@@ -0,0 +1,25 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Check Script Compilation
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 29
+  Title: Check Script Compilation
+  Description: Scripts in the package  must compile successfully and not result in
+    compilation errors
+  CategoryInfo:
+    IsFailFilter: 1
+    IsInclusiveFilter: 1
+    AppliesToSubCategories: 1
+    Filter: []
+  TestScript: {fileID: 11500000, guid: 59db88f43969db8499299bce7f4fb967, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Script Compilation.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Script Compilation.asset.meta
new file mode 100644
index 0000000..b45fff6
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Script Compilation.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: 339e21c955642a04289482aa923e10b6
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check
+    Script Compilation.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Shader Compilation.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Shader Compilation.asset
new file mode 100644
index 0000000..dcbd609
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Shader Compilation.asset	
@@ -0,0 +1,25 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Check Shader Compilation
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 18
+  Title: Check Shader Compilation
+  Description: Please make sure the shaders inside your package do not have errors
+    and compile successfully.
+  CategoryInfo:
+    IsFailFilter: 1
+    IsInclusiveFilter: 1
+    AppliesToSubCategories: 1
+    Filter: []
+  TestScript: {fileID: 11500000, guid: 7abb278a6082bde4391e0779394cb85b, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Shader Compilation.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Shader Compilation.asset.meta
new file mode 100644
index 0000000..0d4b220
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Shader Compilation.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: 1450037453608204a989ff95dca62fae
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check
+    Shader Compilation.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Texture Dimensions.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Texture Dimensions.asset
new file mode 100644
index 0000000..d676f14
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Texture Dimensions.asset	
@@ -0,0 +1,25 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Check Texture Dimensions
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 24
+  Title: Check Texture Dimensions
+  Description: Dimensions of textures, where appropriate, should have pixel counts
+    that are a power of 2
+  CategoryInfo:
+    IsFailFilter: 1
+    IsInclusiveFilter: 1
+    AppliesToSubCategories: 1
+    Filter: []
+  TestScript: {fileID: 11500000, guid: 073f1dacf3da34d4783140ae9d485d5f, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Texture Dimensions.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Texture Dimensions.asset.meta
new file mode 100644
index 0000000..e07ac72
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Texture Dimensions.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: c23253393b8e28846b8e02aeaee7e152
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check
+    Texture Dimensions.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Type Namespaces.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Type Namespaces.asset
new file mode 100644
index 0000000..8331d60
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Type Namespaces.asset	
@@ -0,0 +1,31 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Check Type Namespaces
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 19
+  Title: Check Type Namespaces
+  Description: 'Types in your scripts (classes, interfaces, structs, enums) should
+    be nested under a namespace block to prevent them from being mistaken for other
+    potential types and for better organization as a whole.
+
+
+    It is not allowed
+    to nest your code under a Unity namespace.'
+  CategoryInfo:
+    IsFailFilter: 1
+    IsInclusiveFilter: 1
+    AppliesToSubCategories: 1
+    Filter: []
+  ValidationType: 0
+  TestScript: {fileID: 11500000, guid: 279249fa7ef8c2446b3a9f013eeedbf0, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Type Namespaces.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Type Namespaces.asset.meta
new file mode 100644
index 0000000..83ea2e7
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check Type Namespaces.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: dd110ee16e8de4d48a602349ed7a0b25
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Check
+    Type Namespaces.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove Executable Files.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove Executable Files.asset
new file mode 100644
index 0000000..1a00c2f
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove Executable Files.asset	
@@ -0,0 +1,27 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Remove Executable Files
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 14
+  Title: Remove Executable Files
+  Description: Your package must not contain an .exe, installer programs or applications.
+    If your plugin requires an external program to run, please remove the installer
+    program from your package and write the instructions on how to download and install
+    the installer program in your documentation.
+  CategoryInfo:
+    IsFailFilter: 0
+    IsInclusiveFilter: 1
+    AppliesToSubCategories: 1
+    Filter: []
+  TestScript: {fileID: 11500000, guid: 8e4450592cc60e54286ad089b66db94d, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove Executable Files.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove Executable Files.asset.meta
new file mode 100644
index 0000000..3569956
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove Executable Files.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: e996c53186de96e49a742d414648a809
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove
+    Executable Files.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove JPG Files.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove JPG Files.asset
new file mode 100644
index 0000000..cd2900f
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove JPG Files.asset	
@@ -0,0 +1,30 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Remove JPG Files
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 8
+  Title: Remove JPG Files
+  Description: We do not allow texture images that are saved in lossy formats. Please
+    save all of your images as lossless format file types, such as PNG, TGA, or PSD.
+  CategoryInfo:
+    IsFailFilter: 1
+    IsInclusiveFilter: 1
+    AppliesToSubCategories: 1
+    Filter:
+    - 2D
+    - 3D
+    - Animation
+    - Essentials
+    - VFX/Shaders
+  TestScript: {fileID: 11500000, guid: 5634a12b3a8544c4585bbc280ae59ce2, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove JPG Files.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove JPG Files.asset.meta
new file mode 100644
index 0000000..d0a2eb2
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove JPG Files.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: 781021ae3aa6570468e08d78e3195127
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove
+    JPG Files.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove JavaScript Files.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove JavaScript Files.asset
new file mode 100644
index 0000000..bc5102e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove JavaScript Files.asset	
@@ -0,0 +1,25 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Remove JavaScript Files
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 11
+  Title: Remove JavaScript Files
+  Description: JavaScript / UnityScript files are not allowed, as they are no longer
+    supported.
+  CategoryInfo:
+    IsFailFilter: 0
+    IsInclusiveFilter: 1
+    AppliesToSubCategories: 1
+    Filter: []
+  TestScript: {fileID: 11500000, guid: ab1676bde9afba442b35fd3319c18063, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove JavaScript Files.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove JavaScript Files.asset.meta
new file mode 100644
index 0000000..11b0f88
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove JavaScript Files.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: bf01c18b66907f54c99517f6a877e3e0
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove
+    JavaScript Files.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove Lossy Audio Files.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove Lossy Audio Files.asset
new file mode 100644
index 0000000..954f6fd
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove Lossy Audio Files.asset	
@@ -0,0 +1,32 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Remove Lossy Audio Files
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 12
+  Title: Remove Lossy Audio Files
+  Description: 'We do not recommend audio files that are saved as .mp3 or .ogg. Please
+    save all of your audio as lossless format file types, such as .wav. If you have
+    non-lossy alternative files to your lossy audio files, please make sure to name
+    them identically to avoid rejection. For example: ''shout.mp3'', ''shout.wav''.
+    Listing of the format in the file name is also allowed and accounted for by the
+    validator. For example: ''taunt MP3.mp3'', ''taunt WAV.wav''.'
+  CategoryInfo:
+    IsFailFilter: 1
+    IsInclusiveFilter: 1
+    AppliesToSubCategories: 1
+    Filter:
+    - Audio
+    - Essentials
+    - Templates
+  TestScript: {fileID: 11500000, guid: b7205a85061273a4eb50586f13f35d35, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove Lossy Audio Files.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove Lossy Audio Files.asset.meta
new file mode 100644
index 0000000..1084792
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove Lossy Audio Files.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: a48657926de5cfb47ac559a7108d03ee
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove
+    Lossy Audio Files.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove Mixamo Files.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove Mixamo Files.asset
new file mode 100644
index 0000000..8d3cc14
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove Mixamo Files.asset	
@@ -0,0 +1,26 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Remove Mixamo Files
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 15
+  Title: Remove Mixamo Files
+  Description: We do not allow or accept packages files that were made with third-party
+    software, such as Mixamo, Fuse, etc. because these files are under licensing
+    that does not agree with the Asset Store End User License Agreement (EULA).
+  CategoryInfo:
+    IsFailFilter: 0
+    IsInclusiveFilter: 1
+    AppliesToSubCategories: 1
+    Filter: []
+  TestScript: {fileID: 11500000, guid: 9df432e52aa958b44bb5e20c13d16552, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove Mixamo Files.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove Mixamo Files.asset.meta
new file mode 100644
index 0000000..8d2699e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove Mixamo Files.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: a0a44055f786ec64f86a07a214d5f831
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove
+    Mixamo Files.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove SpeedTree Files.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove SpeedTree Files.asset
new file mode 100644
index 0000000..14ff13f
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove SpeedTree Files.asset	
@@ -0,0 +1,25 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Remove SpeedTree Files
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 16
+  Title: Remove SpeedTree Files
+  Description: You cannot redistribute SpeedTree files on other marketplaces. Please
+    remove all SpeedTree files that are in this package.
+  CategoryInfo:
+    IsFailFilter: 0
+    IsInclusiveFilter: 1
+    AppliesToSubCategories: 1
+    Filter: []
+  TestScript: {fileID: 11500000, guid: e06bb7e0aa4f9944abc18281c002dff4, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove SpeedTree Files.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove SpeedTree Files.asset.meta
new file mode 100644
index 0000000..cc98ca3
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove SpeedTree Files.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: 305bbe67f7c644d18bc8a5b2273aa6a4
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove
+    SpeedTree Files.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove Video Files.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove Video Files.asset
new file mode 100644
index 0000000..1df19b9
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove Video Files.asset	
@@ -0,0 +1,26 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Remove Video Files
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 13
+  Title: Remove Video Files
+  Description: You cannot include a video file in your package. Please upload your
+    video file to an online video hosting website (Youtube, Vimeo, etc.) and include
+    the link to the video in your written documentation.
+  CategoryInfo:
+    IsFailFilter: 1
+    IsInclusiveFilter: 1
+    AppliesToSubCategories: 1
+    Filter: []
+  TestScript: {fileID: 11500000, guid: f99724c71b0de66419b5d6e8e9bfcc2d, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove Video Files.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove Video Files.asset.meta
new file mode 100644
index 0000000..7f4074e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove Video Files.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: 893a0df188c2026438be48eed39b301f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/Generic/Remove
+    Video Files.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/UnityPackage.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/UnityPackage.meta
new file mode 100644
index 0000000..0a50cef
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/UnityPackage.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8e978e836f2fb224fa11de94e913da49
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/UnityPackage/Check Demo Scenes.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/UnityPackage/Check Demo Scenes.asset
new file mode 100644
index 0000000..af6ecc2
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/UnityPackage/Check Demo Scenes.asset	
@@ -0,0 +1,34 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Check Demo Scenes
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 1
+  Title: Check Demo Scenes
+  Description: If your product has content to show off, it should be displayed in
+    a demo scene. Please provide a practical demo with all of your assets set up.
+    If your asset is based on scripting or Editor extensions, please consider adding
+    a demo scene showcasing the asset or showing setup steps in the scene.
+  CategoryInfo:
+    IsFailFilter: 1
+    IsInclusiveFilter: 1
+    AppliesToSubCategories: 1
+    Filter:
+    - 3D
+    - 2D
+    - Animation
+    - Essentials
+    - Templates
+    - VFX
+  ValidationType: 1
+  TestScript: {fileID: 11500000, guid: f844c2dfa4669ff4eacf5591b544edaf, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/UnityPackage/Check Demo Scenes.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/UnityPackage/Check Demo Scenes.asset.meta
new file mode 100644
index 0000000..d2a6996
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/UnityPackage/Check Demo Scenes.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: f108107be07f69045813d69eff580078
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/UnityPackage/Check
+    Demo Scenes.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/UnityPackage/Check Documentation.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/UnityPackage/Check Documentation.asset
new file mode 100644
index 0000000..6ce011e
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/UnityPackage/Check Documentation.asset	
@@ -0,0 +1,32 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Check Documentation
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 6
+  Title: Check Documentation
+  Description: If your asset contains any code (scripts, shaders) - we ask that you
+    include offline documentation in the format of pdf or rtf with your submission,
+    as it is mandatory for all packages that include scripts or other components
+    that require set up. Your documentation must be organized with a table of contents
+    and numbered, written in English and have no grammar mistakes. Create a setup
+    guide with a step-by-step tutorial (pdf or video), as well as a script reference
+    if users will need to do any coding. If your asset contains art (3D models, sprites)
+    and you used code to set up a demo scene, you may skip this step.
+  CategoryInfo:
+    IsFailFilter: 1
+    IsInclusiveFilter: 1
+    AppliesToSubCategories: 1
+    Filter: []
+  ValidationType: 1
+  TestScript: {fileID: 11500000, guid: 3c8425198983eda4c9b35aa0d59ea33c, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/UnityPackage/Check Documentation.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/UnityPackage/Check Documentation.asset.meta
new file mode 100644
index 0000000..b6978e2
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/UnityPackage/Check Documentation.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: b03433f7977b29e4ca7e8d76393a6c26
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/UnityPackage/Check
+    Documentation.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/UnityPackage/Check Package Size.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/UnityPackage/Check Package Size.asset
new file mode 100644
index 0000000..e80b2c4
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/UnityPackage/Check Package Size.asset	
@@ -0,0 +1,25 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Check Package Size
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 30
+  Title: Check Package Size
+  Description: Package submissions should not be more than 6 GB in size
+  CategoryInfo:
+    IsFailFilter: 0
+    IsInclusiveFilter: 0
+    AppliesToSubCategories: 1
+    Filter: []
+  ValidationType: 1
+  TestScript: {fileID: 11500000, guid: a8601b99f4afa5049954f3a2dd5996d6, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/UnityPackage/Check Package Size.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/UnityPackage/Check Package Size.asset.meta
new file mode 100644
index 0000000..eaf1896
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/UnityPackage/Check Package Size.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: 25721b2d7384e5b4f936cf3b33b80a02
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/UnityPackage/Check
+    Package Size.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/UnityPackage/Check Project Template Assets.asset b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/UnityPackage/Check Project Template Assets.asset
new file mode 100644
index 0000000..645117c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/UnityPackage/Check Project Template Assets.asset	
@@ -0,0 +1,36 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d813ff809ae82f643bf975031305d541, type: 3}
+  m_Name: Check Project Template Assets
+  m_EditorClassIdentifier: 
+  HasBeenInitialized: 1
+  Id: 34
+  Title: Check Project Template Assets
+  Description: 'Assets in your package derived from project template assets should
+    be assigned a new GUID and be located under a different path.
+
+
+    This is to
+    minimize the risk of users accidentally overwriting their own assets when importing
+    your package.
+
+
+    Example commonly used asset: ''Assets/Scenes/SampleScene.unity'''
+  CategoryInfo:
+    IsFailFilter: 0
+    IsInclusiveFilter: 1
+    AppliesToSubCategories: 1
+    Filter:
+    - Essentials
+    - Templates
+  ValidationType: 1
+  TestScript: {fileID: 11500000, guid: f02d52a702c712e4e8089f7c2e65bae7, type: 3}
diff --git a/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/UnityPackage/Check Project Template Assets.asset.meta b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/UnityPackage/Check Project Template Assets.asset.meta
new file mode 100644
index 0000000..e8d4e6c
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/Editor/Validator/Tests/UnityPackage/Check Project Template Assets.asset.meta	
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: 5392e9de0549574419ff76897d1e0fa1
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/Editor/Validator/Tests/UnityPackage/Check
+    Project Template Assets.asset
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/LICENSE.md b/Packages/com.unity.asset-store-tools/LICENSE.md
new file mode 100644
index 0000000..f3f4c3b
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/LICENSE.md
@@ -0,0 +1,5 @@
+Asset Store Tools v2 copyright © 2025 Unity Technologies
+
+Source code of the package is licensed under the Unity Companion License (see https://unity.com/legal/licenses/unity-companion-license); otherwise licensed under the Unity Package Distribution License (see https://unity.com/legal/licenses/unity-package-distribution-license )
+
+Unless expressly provided otherwise, the software under this license is made available strictly on an “AS IS” BASIS WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED. Please review the license for details on these and other terms and conditions.
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/LICENSE.md.meta b/Packages/com.unity.asset-store-tools/LICENSE.md.meta
new file mode 100644
index 0000000..b20ebc6
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/LICENSE.md.meta
@@ -0,0 +1,14 @@
+fileFormatVersion: 2
+guid: baeaa62ad0dc664428d6069db8fd986d
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/LICENSE.md
+  uploadId: 724584
diff --git a/Packages/com.unity.asset-store-tools/package.json b/Packages/com.unity.asset-store-tools/package.json
new file mode 100644
index 0000000..abfef6b
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "com.unity.asset-store-tools",
+  "displayName": "Asset Store Tools",
+  "version": "12.0.1",
+  "unity": "2019.4",
+  "description": "Whether you're a programmer, game designer, texture artist or 3D modeler, you're welcome to share your creations with everybody in the Unity developer community!",
+  "type": "tool",
+  "dependencies": {
+    "com.unity.nuget.newtonsoft-json": "3.2.1"
+  }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.asset-store-tools/package.json.meta b/Packages/com.unity.asset-store-tools/package.json.meta
new file mode 100644
index 0000000..c268247
--- /dev/null
+++ b/Packages/com.unity.asset-store-tools/package.json.meta
@@ -0,0 +1,14 @@
+fileFormatVersion: 2
+guid: fca7c22c787fbfd4cb0d7f186668631a
+PackageManifestImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 115
+  packageName: Asset Store Publishing Tools
+  packageVersion: 12.0.1
+  assetPath: Packages/com.unity.asset-store-tools/package.json
+  uploadId: 724584
diff --git a/Packages/manifest.json b/Packages/manifest.json
index dad4fc6..99cc6a6 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -1,8 +1,7 @@
 {
   "dependencies": {
-    "com.mikeschweitzer.websocket": "3.0.3",
-    "com.unity.ide.visualstudio": "2.0.22",
-    "com.unity.test-framework": "1.4.5",
+    "com.unity.ide.visualstudio": "2.0.23",
+    "com.unity.test-framework": "1.4.6",
     "com.unity.ugui": "2.0.0",
     "com.unity.modules.accessibility": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
@@ -37,13 +36,5 @@
     "com.unity.modules.wind": "1.0.0",
     "com.unity.modules.xr": "1.0.0"
   },
-  "scopedRegistries": [
-    {
-      "name": "package.openupm.com",
-      "url": "https://package.openupm.com",
-      "scopes": [
-        "com.mikeschweitzer.websocket"
-      ]
-    }
-  ]
+  "scopedRegistries": []
 }
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index 36d35c5..bdf72d6 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -1,19 +1,11 @@
 {
   "dependencies": {
-    "com.mikeschweitzer.websocket": {
-      "version": "3.0.3",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://package.openupm.com"
-    },
-    "com.trytalo.talo": {
-      "version": "file:com.trytalo.talo",
+    "com.unity.asset-store-tools": {
+      "version": "file:com.unity.asset-store-tools",
       "depth": 0,
       "source": "embedded",
       "dependencies": {
-        "com.unity.test-framework": "1.3.0",
-        "com.mikeschweitzer.websocket": "3.0.1"
+        "com.unity.nuget.newtonsoft-json": "3.2.1"
       }
     },
     "com.unity.ext.nunit": {
@@ -24,7 +16,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.22",
+      "version": "2.0.23",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -32,8 +24,15 @@
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.nuget.newtonsoft-json": {
+      "version": "3.2.1",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
     "com.unity.test-framework": {
-      "version": "1.4.5",
+      "version": "1.4.6",
       "depth": 0,
       "source": "registry",
       "dependencies": {
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index e81c432..b616166 100644
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -6,6 +6,7 @@ EditorBuildSettings:
   serializedVersion: 2
   m_Scenes:
   - enabled: 1
-    path: Assets/Samples/Playground/Scenes/Playground.unity
+    path: Assets/Talo Game Services/Talo/Samples/Playground/Scenes/Playground.unity
     guid: 2cda990e2423bbf4892e6590ba056729
   m_configObjects: {}
+  m_UseUCBPForAssetBundles: 0
diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset
index 4d61076..1f39987 100644
--- a/ProjectSettings/PackageManagerSettings.asset
+++ b/ProjectSettings/PackageManagerSettings.asset
@@ -27,15 +27,7 @@ MonoBehaviour:
     m_IsDefault: 1
     m_Capabilities: 7
     m_ConfigSource: 0
-  - m_Id: scoped:project:package.openupm.com
-    m_Name: package.openupm.com
-    m_Url: https://package.openupm.com
-    m_Scopes:
-    - com.mikeschweitzer.websocket
-    m_IsDefault: 0
-    m_Capabilities: 0
-    m_ConfigSource: 4
-  m_UserSelectedRegistryName: package.openupm.com
+  m_UserSelectedRegistryName: 
   m_UserAddingNewScopedRegistry: 0
   m_RegistryInfoDraft:
     m_Modified: 0
diff --git a/README.md b/README.md
index efd90a5..15bd7b3 100644
--- a/README.md
+++ b/README.md
@@ -6,10 +6,19 @@ From essentials like player management, stats and leaderboards to advanced APIs
 
 The Talo Unity Package is a lightweight wrapper around the [REST API](https://docs.trytalo.com/docs/http/authentication). It also includes handy utilities and a collection of ready-to-use samples.
 
-This repo is a Unity game (the Talo Playground) that lets you try out and preview functionality from a UI. Within that, Talo is installed as a local package.
+## Project structure
+
+You can find the code, samples and tests in the `Assets/Talo Game Services/Talo` folder.
+
+## Submodules
+
+This project uses git submodules to manage dependencies (Unity's dependency management is a [nightmare](https://trytalo.com/blog/building-unity-packages)).
+
+You'll need to init the submodules after cloning: `git submodule update --init`.
 
 ## Get the package
 
+- [Unity Asset Store](https://assetstore.unity.com/packages/slug/292832)
 - [GitHub releases](https://github.com/TaloDev/unity/releases)
 - [itch.io](https://sleepystudios.itch.io/talo-unity)
 
@@ -33,6 +42,7 @@ This repo is a Unity game (the Talo Playground) that lets you try out and previe
 - 💾 Game saves: a basic saves UI, allowing you to load, create and update saves.
 - 🔒 Authentication: a registration/login flow, showing how to create player accounts and authenticate them.
 - 🎮 Playground: a text-based playground allowing you to test identifying, events, stats and leaderboards.
+- 💬 Chat: showing how to send messages between channels in a chat room.
 
 ## Documentation