andrei2699 · Mar 27, 2026 · Mar 23, 2026 · Mar 23, 2026 · Mar 23, 2026 · Mar 23, 2026
diff --git a/.gitignore b/.gitignore
@@ -71,7 +71,6 @@ BenchmarkDotNet.Artifacts/
 # .NET Core
 project.lock.json
 project.fragment.lock.json
-artifacts/
 
 # ASP.NET Scaffolding
 ScaffoldingReadMe.txt

diff --git a/ScriptBee.slnx b/ScriptBee.slnx
@@ -6,51 +6,62 @@
     <Project Path="ScriptBeeWebApp/src/Common/Common/Common.csproj" />
     <Project Path="ScriptBeeWebApp/src/Common/Common.Web/Common.Web.csproj" />
     <Project Path="ScriptBeeWebApp/src/Common/Model/Model.csproj" />
+    <Project Path="ScriptBeeWebApp/src/Workspace/Analysis/Analysis/Analysis.csproj" />
+    <Project Path="ScriptBeeWebApp/src/Common/Marketplace.Client/Marketplace.Client.csproj" />
+    <Project Path="ScriptBeeWebApp/src/Common/Persistence.Mongodb.Abstractions/Persistence.Mongodb.Abstractions.csproj" />
+
+    <Project Path="ScriptBeeWebApp/src/Workspace/Artifacts/Artifacts/Artifacts.csproj" />
+    <Project Path="ScriptBeeWebApp/src/Workspace/Artifacts/Artifacts.Mongodb/Artifacts.Mongodb.csproj" />
 
     <!-- Analysis Bounded Context -->
     <!-- Adapters -->
     <Project Path="ScriptBeeWebApp/src/Analysis/Adapters/Analysis.Web/Analysis.Web.csproj" />
     <Project Path="ScriptBeeWebApp/src/Analysis/Adapters/Persistence.File/Persistence.File.csproj" />
     <Project Path="ScriptBeeWebApp/src/Analysis/Adapters/Persistence.InMemory/Persistence.InMemory.csproj" />
+    <Project Path="ScriptBeeWebApp/src/Workspace/Analysis/Analysis.Mongodb/Analysis.Mongodb.csproj" />
     <!-- Application Layer -->
-    <Project Path="ScriptBeeWebApp/src/Analysis/Application/Ports.Analysis/Ports.Analysis.csproj" />
-    <Project Path="ScriptBeeWebApp/src/Analysis/Application/Ports.Files/Ports.Files.csproj" />
+    <Project Path="ScriptBeeWebApp/src/Analysis/Application/Ports.Plugins/Ports.Plugins.csproj" />
     <Project Path="ScriptBeeWebApp/src/Analysis/Application/Service.Plugin/Service.Plugin.csproj" />
+    <Project Path="ScriptBeeWebApp/src/Analysis/Application/Service.Analysis/Service.Analysis.csproj" />
     <Project Path="ScriptBeeWebApp/src/Analysis/Application/UseCases.Analysis/UseCases.Analysis.csproj" />
+    <Project Path="ScriptBeeWebApp/src/Analysis/Application/UseCases.Plugin/UseCases.Plugin.csproj" />
 
     <!-- Gateway Bounded Context -->
     <!-- Adapters -->
     <Project Path="ScriptBeeWebApp/src/Gateway/Adapters/Analysis.Instance.Docker/Analysis.Instance.Docker.csproj" />
-    <Project Path="ScriptBeeWebApp/src/Gateway/Adapters/Marketplace.Client/Marketplace.Client.csproj" />
-    <Project Path="ScriptBeeWebApp/src/Gateway/Adapters/Persistence.Mongodb/Persistence.Mongodb.csproj" />
     <Project Path="ScriptBeeWebApp/src/Gateway/Adapters/Rest/Rest.csproj" />
     <Project Path="ScriptBeeWebApp/src/Gateway/Adapters/Web/Web.csproj" />
+    <Project Path="ScriptBeeWebApp/src/Gateway/Adapters/Persistence.Mongodb.Gateway/Persistence.Mongodb.Gateway.csproj" />
+    <Project Path="ScriptBeeWebApp/src/Gateway/Application/Ports.Instance.Allocation/Ports.Instance.Allocation.csproj" />
     <!-- Application Layer -->
     <Project Path="ScriptBeeWebApp/src/Gateway/Application/Ports.Instance/Ports.Instance.csproj" />
-    <Project Path="ScriptBeeWebApp/src/Gateway/Application/Ports.Plugins/Ports.Plugins.csproj" />
     <Project Path="ScriptBeeWebApp/src/Gateway/Application/Ports.Project/Ports.Project.csproj" />
-    <Project Path="ScriptBeeWebApp/src/Gateway/Application/Service.Analysis/Service.Analysis.csproj" />
+    <Project Path="ScriptBeeWebApp/src/Gateway/Application/Ports.Plugins.Fetching/Ports.Plugins.Fetching.csproj" />
     <Project Path="ScriptBeeWebApp/src/Gateway/Application/Service.Project/Service.Project.csproj" />
-    <Project Path="ScriptBeeWebApp/src/Gateway/Application/UseCases.Plugin/UseCases.Plugin.csproj" />
     <Project Path="ScriptBeeWebApp/src/Gateway/Application/UseCases.Project/UseCases.Project.csproj" />
 
     <!-- Tests - Common Layer -->
     <Project Path="ScriptBeeWebApp/test/Common/Common.Tests/Common.Tests.csproj" />
     <Project Path="ScriptBeeWebApp/test/Common/Model.Tests/Model.Tests.csproj" />
     <Project Path="ScriptBeeWebApp/test/Common/Tests.Common/Tests.Common.csproj" />
+    <Project Path="ScriptBeeWebApp/test/Common/Tests.Common.Mongodb/Tests.Common.Mongodb.csproj" />
+    <Project Path="ScriptBeeWebApp/test/Common/Marketplace.Client.Tests/Marketplace.Client.Tests.csproj" />
+
+    <Project Path="ScriptBeeWebApp/test/Workspace/Artifacts/Artifacts.Tests/Artifacts.Tests.csproj" />
+    <Project Path="ScriptBeeWebApp/test/Workspace/Artifacts/Artifacts.Mongodb.Tests/Artifacts.Mongodb.Tests.csproj" />
+    <Project Path="ScriptBeeWebApp/test/Workspace/Analysis/Analysis.Mongodb.Tests/Analysis.Mongodb.Tests.csproj" />
 
     <!-- Tests - Analysis Context -->
     <Project Path="ScriptBeeWebApp/test/Analysis/Adapters/Analysis.Web.Tests/Analysis.Web.Tests.csproj" />
     <Project Path="ScriptBeeWebApp/test/Analysis/Adapters/Persistence.File.Tests/Persistence.File.Tests.csproj" />
     <Project Path="ScriptBeeWebApp/test/Analysis/Adapters/Persistence.InMemory.Tests/Persistence.InMemory.Tests.csproj" />
+    <Project Path="ScriptBeeWebApp/test/Analysis/Application/Service.Analysis.Tests/Service.Analysis.Tests.csproj" />
     <Project Path="ScriptBeeWebApp/test/Analysis/Application/Service.Plugin.Tests/Service.Plugin.Tests.csproj" />
 
     <!-- Tests - Gateway Context -->
     <Project Path="ScriptBeeWebApp/test/Gateway/Adapters/Analysis.Instance.Docker.Tests/Analysis.Instance.Docker.Tests.csproj" />
-    <Project Path="ScriptBeeWebApp/test/Gateway/Adapters/Marketplace.Client.Tests/Marketplace.Client.Tests.csproj" />
-    <Project Path="ScriptBeeWebApp/test/Gateway/Adapters/Persistence.Mongodb.Tests/Persistence.Mongodb.Tests.csproj" />
     <Project Path="ScriptBeeWebApp/test/Gateway/Adapters/Rest.Tests/Rest.Tests.csproj" />
     <Project Path="ScriptBeeWebApp/test/Gateway/Adapters/Web.Tests/Web.Tests.csproj" />
-    <Project Path="ScriptBeeWebApp/test/Gateway/Application/Service.Analysis.Tests/Service.Analysis.Tests.csproj" />
+    <Project Path="ScriptBeeWebApp/test/Gateway/Adapters/Persistence.Mongodb.Gateway.Tests/Persistence.Mongodb.Gateway.Tests.csproj" />
     <Project Path="ScriptBeeWebApp/test/Gateway/Application/Service.Project.Tests/Service.Project.Tests.csproj" />
 </Solution>
diff --git a/ScriptBeeWebApp/src/Analysis/Adapters/Analysis.Web/Analysis.Web.csproj b/ScriptBeeWebApp/src/Analysis/Adapters/Analysis.Web/Analysis.Web.csproj
@@ -9,12 +9,15 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Common\Common\Common.csproj" />
-    <ProjectReference Include="..\Persistence.InMemory\Persistence.InMemory.csproj" />
     <ProjectReference Include="..\..\..\Common\Common.Web\Common.Web.csproj" />
-    <ProjectReference Include="..\..\..\Gateway\Application\Service.Analysis\Service.Analysis.csproj" />
-    <ProjectReference Include="..\..\..\Analysis\Application\Service.Plugin\Service.Plugin.csproj" />
-    <ProjectReference Include="..\..\..\Analysis\Application\UseCases.Analysis\UseCases.Analysis.csproj" />
+    <ProjectReference Include="..\..\..\Workspace\Artifacts\Artifacts\Artifacts.csproj" />
+    <ProjectReference Include="..\..\..\Workspace\Artifacts\Artifacts.Mongodb\Artifacts.Mongodb.csproj" />
+    <ProjectReference Include="..\..\..\Workspace\Analysis\Analysis\Analysis.csproj" />
+    <ProjectReference Include="..\..\..\Workspace\Analysis\Analysis.Mongodb\Analysis.Mongodb.csproj" />
+    <ProjectReference Include="..\Persistence.InMemory\Persistence.InMemory.csproj" />
     <ProjectReference Include="..\Persistence.File\Persistence.File.csproj" />
-    <ProjectReference Include="..\..\..\Gateway\Adapters\Persistence.Mongodb\Persistence.Mongodb.csproj" />
+    <ProjectReference Include="..\..\Application\Service.Plugin\Service.Plugin.csproj" />
+    <ProjectReference Include="..\..\Application\Service.Analysis\Service.Analysis.csproj" />
+    <ProjectReference Include="..\..\Application\UseCases.Analysis\UseCases.Analysis.csproj" />
   </ItemGroup>
 </Project>
diff --git a/ScriptBeeWebApp/src/Analysis/Adapters/Analysis.Web/Extensions/MongoDbExtensions.cs b/ScriptBeeWebApp/src/Analysis/Adapters/Analysis.Web/Extensions/MongoDbExtensions.cs
@@ -1,4 +1,6 @@
-using static ScriptBee.Persistence.Mongodb.Extensions.MongoDbExtensions;
+using ScriptBee.Analysis.Mongodb.Extensions;
+using ScriptBee.Artifacts.Mongodb.Extensions;
+using ScriptBee.Persistence.Mongodb.Extensions;
 
 namespace ScriptBee.Analysis.Web.Extensions;
 

diff --git a/...ebApp/src/Analysis/Adapters/Persistence.File/Extensions/ConfigureFileAdapterExtensions.cs b/...ebApp/src/Analysis/Adapters/Persistence.File/Extensions/ConfigureFileAdapterExtensions.cs
@@ -1,8 +1,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using ScriptBee.Persistence.File.Config;
+using ScriptBee.Artifacts.Extensions;
 using ScriptBee.Persistence.File.Plugin;
-using ScriptBee.Ports.Files;
 using ScriptBee.Ports.Plugins;
 
 namespace ScriptBee.Persistence.File.Extensions;
@@ -14,12 +13,8 @@ public static IServiceCollection AddFileAdapters(
         IConfigurationSection userFolderConfigurationSection
     )
     {
-        services.Configure<UserFolderSettings>(userFolderConfigurationSection);
         return services
-            .AddSingleton<IConfigFoldersService, ConfigFoldersService>()
-            .AddSingleton<ICreateFile, CreateFileAdapter>()
-            .AddSingleton<ILoadFile, LoadFileAdapter>()
-            .AddSingleton<IFileService, FileService>()
+            .AddArtifactFileAdapters(userFolderConfigurationSection)
             .AddSingleton<IPluginDiscriminatorHolder, PluginDiscriminatorHolder>()
             .AddSingleton<IPluginManifestYamlFileReader, PluginManifestYamlFileReader>()
             .AddSingleton<IPluginReader, PluginReader>();

diff --git a/ScriptBeeWebApp/src/Analysis/Adapters/Persistence.File/Persistence.File.csproj b/ScriptBeeWebApp/src/Analysis/Adapters/Persistence.File/Persistence.File.csproj
@@ -8,9 +8,8 @@
     <PackageReference Include="YamlDotNet" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Analysis\Application\Ports.Files\Ports.Files.csproj" />
-    <ProjectReference Include="..\..\..\Gateway\Application\Ports.Plugins\Ports.Plugins.csproj" />
-    <ProjectReference Include="..\..\..\Gateway\Application\Ports.Project\Ports.Project.csproj" />
-    <ProjectReference Include="..\..\..\Analysis\Application\Ports.Analysis\Ports.Analysis.csproj" />
+    <ProjectReference Include="..\..\..\Common\Marketplace.Client\Marketplace.Client.csproj" />
+    <ProjectReference Include="..\..\..\Workspace\Artifacts\Artifacts\Artifacts.csproj" />
+    <ProjectReference Include="..\..\Application\Ports.Plugins\Ports.Plugins.csproj" />
   </ItemGroup>
 </Project>
diff --git a/...eeWebApp/src/Analysis/Adapters/Persistence.File/Plugin/Installer/BundlePluginInstaller.cs b/...eeWebApp/src/Analysis/Adapters/Persistence.File/Plugin/Installer/BundlePluginInstaller.cs
@@ -1,6 +1,7 @@
 using Microsoft.Extensions.Logging;
 using ScriptBee.Domain.Model.Config;
 using ScriptBee.Domain.Model.Plugin.Manifest;
+using ScriptBee.Marketplace.Client;
 using ScriptBee.Ports.Plugins;
 using ScriptBee.Ports.Plugins.Installer;
 

diff --git a/...WebApp/src/Analysis/Adapters/Persistence.File/Plugin/Installer/BundlePluginUninstaller.cs b/...WebApp/src/Analysis/Adapters/Persistence.File/Plugin/Installer/BundlePluginUninstaller.cs
@@ -1,4 +1,5 @@
 using Microsoft.Extensions.Logging;
+using ScriptBee.Artifacts;
 using ScriptBee.Domain.Model.Config;
 using ScriptBee.Domain.Model.Plugin.Manifest;
 using ScriptBee.Ports.Plugins;

diff --git a/ScriptBeeWebApp/src/Analysis/Adapters/Persistence.File/Plugin/Installer/PluginUninstaller.cs b/ScriptBeeWebApp/src/Analysis/Adapters/Persistence.File/Plugin/Installer/PluginUninstaller.cs
@@ -1,4 +1,5 @@
 using Microsoft.Extensions.Logging;
+using ScriptBee.Artifacts;
 using ScriptBee.Domain.Model.Config;
 
 namespace ScriptBee.Persistence.File.Plugin.Installer;

diff --git a/...eeWebApp/src/Analysis/Adapters/Persistence.File/Plugin/Installer/SimplePluginInstaller.cs b/...eeWebApp/src/Analysis/Adapters/Persistence.File/Plugin/Installer/SimplePluginInstaller.cs
@@ -1,4 +1,5 @@
 using Microsoft.Extensions.Logging;
+using ScriptBee.Artifacts;
 using ScriptBee.Domain.Model.Config;
 using ScriptBee.Persistence.File.Exceptions;
 

diff --git a/ScriptBeeWebApp/src/Analysis/Adapters/Persistence.File/Plugin/PluginReader.cs b/ScriptBeeWebApp/src/Analysis/Adapters/Persistence.File/Plugin/PluginReader.cs
@@ -1,4 +1,5 @@
 using Microsoft.Extensions.Logging;
+using ScriptBee.Artifacts;
 using ScriptBee.Domain.Model.Plugin.Manifest;
 using ScriptBee.Ports.Plugins;
 

diff --git a/ScriptBeeWebApp/src/Analysis/Adapters/Persistence.InMemory/Persistence.InMemory.csproj b/ScriptBeeWebApp/src/Analysis/Adapters/Persistence.InMemory/Persistence.InMemory.csproj
@@ -3,9 +3,9 @@
     <RootNamespace>ScriptBee.Persistence.InMemory</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Gateway\Application\Ports.Plugins\Ports.Plugins.csproj" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+    <ProjectReference Include="..\..\Application\Ports.Plugins\Ports.Plugins.csproj" />
   </ItemGroup>
 </Project>
diff --git a/...pplication/Ports.Plugins/IPluginReader.cs → ...pplication/Ports.Plugins/IPluginReader.cs b/...pplication/Ports.Plugins/IPluginReader.cs → ...pplication/Ports.Plugins/IPluginReader.cs
diff --git a/...rts.Plugins/IPluginRegistrationService.cs → ...rts.Plugins/IPluginRegistrationService.cs b/...rts.Plugins/IPluginRegistrationService.cs → ...rts.Plugins/IPluginRegistrationService.cs
diff --git a/...cation/Ports.Plugins/IPluginRepository.cs → ...cation/Ports.Plugins/IPluginRepository.cs b/...cation/Ports.Plugins/IPluginRepository.cs → ...cation/Ports.Plugins/IPluginRepository.cs
diff --git a/...ugins/Installer/IBundlePluginInstaller.cs → ...ugins/Installer/IBundlePluginInstaller.cs b/...ugins/Installer/IBundlePluginInstaller.cs → ...ugins/Installer/IBundlePluginInstaller.cs
diff --git a/...ins/Installer/IBundlePluginUninstaller.cs → ...ins/Installer/IBundlePluginUninstaller.cs b/...ins/Installer/IBundlePluginUninstaller.cs → ...ins/Installer/IBundlePluginUninstaller.cs
diff --git a/...cation/Ports.Plugins/Ports.Plugins.csproj → ...cation/Ports.Plugins/Ports.Plugins.csproj b/...cation/Ports.Plugins/Ports.Plugins.csproj → ...cation/Ports.Plugins/Ports.Plugins.csproj
diff --git a/...ce.Analysis/CalculationInstanceService.cs → ...ce.Analysis/CalculationInstanceService.cs b/...ce.Analysis/CalculationInstanceService.cs → ...ce.Analysis/CalculationInstanceService.cs
diff --git a/...n/Service.Analysis/ClearContextService.cs → ...n/Service.Analysis/ClearContextService.cs b/...n/Service.Analysis/ClearContextService.cs → ...n/Service.Analysis/ClearContextService.cs
diff --git a/...ion/Service.Analysis/GetContextService.cs → ...ion/Service.Analysis/GetContextService.cs b/...ion/Service.Analysis/GetContextService.cs → ...ion/Service.Analysis/GetContextService.cs
diff --git a/...ce.Analysis/GetInstalledPluginsService.cs → ...ce.Analysis/GetInstalledPluginsService.cs b/...ce.Analysis/GetInstalledPluginsService.cs → ...ce.Analysis/GetInstalledPluginsService.cs
diff --git a/...vice.Analysis/HelperFunctionsContainer.cs → ...vice.Analysis/HelperFunctionsContainer.cs b/...vice.Analysis/HelperFunctionsContainer.cs → ...vice.Analysis/HelperFunctionsContainer.cs
diff --git a/....Analysis/HelperFunctionsResultService.cs → ....Analysis/HelperFunctionsResultService.cs b/....Analysis/HelperFunctionsResultService.cs → ....Analysis/HelperFunctionsResultService.cs
@@ -1,8 +1,8 @@
 using System.Text;
 using DxWorks.ScriptBee.Plugin.Api.Services;
+using ScriptBee.Artifacts;
 using ScriptBee.Common;
 using ScriptBee.Domain.Model.Analysis;
-using ScriptBee.Ports.Files;
 
 namespace ScriptBee.Service.Analysis;
 

diff --git a/...ervice.Analysis/ILoadModelFilesService.cs → ...ervice.Analysis/ILoadModelFilesService.cs b/...ervice.Analysis/ILoadModelFilesService.cs → ...ervice.Analysis/ILoadModelFilesService.cs
diff --git a/...ation/Service.Analysis/IProjectManager.cs → ...ation/Service.Analysis/IProjectManager.cs b/...ation/Service.Analysis/IProjectManager.cs → ...ation/Service.Analysis/IProjectManager.cs
diff --git a/...tion/Service.Analysis/IResultCollector.cs → ...tion/Service.Analysis/IResultCollector.cs b/...tion/Service.Analysis/IResultCollector.cs → ...tion/Service.Analysis/IResultCollector.cs
diff --git a/...ion/Service.Analysis/IRunScriptService.cs → ...ion/Service.Analysis/IRunScriptService.cs b/...ion/Service.Analysis/IRunScriptService.cs → ...ion/Service.Analysis/IRunScriptService.cs
diff --git a/...on/Service.Analysis/LinkContextService.cs → ...on/Service.Analysis/LinkContextService.cs b/...on/Service.Analysis/LinkContextService.cs → ...on/Service.Analysis/LinkContextService.cs
diff --git a/...on/Service.Analysis/LoadContextService.cs → ...on/Service.Analysis/LoadContextService.cs b/...on/Service.Analysis/LoadContextService.cs → ...on/Service.Analysis/LoadContextService.cs
diff --git a/...Service.Analysis/LoadModelFilesService.cs → ...Service.Analysis/LoadModelFilesService.cs b/...Service.Analysis/LoadModelFilesService.cs → ...Service.Analysis/LoadModelFilesService.cs
@@ -1,7 +1,7 @@
 using DxWorks.ScriptBee.Plugin.Api;
 using DxWorks.ScriptBee.Plugin.Api.Model;
+using ScriptBee.Artifacts;
 using ScriptBee.Domain.Model.File;
-using ScriptBee.Ports.Files;
 using ScriptBee.Ports.Plugins;
 
 namespace ScriptBee.Service.Analysis;

diff --git a/...cation/Service.Analysis/ProjectManager.cs → ...cation/Service.Analysis/ProjectManager.cs b/...cation/Service.Analysis/ProjectManager.cs → ...cation/Service.Analysis/ProjectManager.cs
diff --git a/...ation/Service.Analysis/ResultCollector.cs → ...ation/Service.Analysis/ResultCollector.cs b/...ation/Service.Analysis/ResultCollector.cs → ...ation/Service.Analysis/ResultCollector.cs
diff --git a/...on/Service.Analysis/RunAnalysisService.cs → ...on/Service.Analysis/RunAnalysisService.cs b/...on/Service.Analysis/RunAnalysisService.cs → ...on/Service.Analysis/RunAnalysisService.cs
@@ -1,13 +1,13 @@
 using System.Threading.Channels;
 using DxWorks.ScriptBee.Plugin.Api;
 using OneOf;
+using ScriptBee.Analysis;
+using ScriptBee.Artifacts;
 using ScriptBee.Common;
 using ScriptBee.Domain.Model.Analysis;
 using ScriptBee.Domain.Model.Errors;
 using ScriptBee.Domain.Model.ProjectStructure;
-using ScriptBee.Ports.Analysis;
 using ScriptBee.Ports.Plugins;
-using ScriptBee.Ports.Project.Structure;
 using ScriptBee.UseCases.Analysis;
 
 namespace ScriptBee.Service.Analysis;

diff --git a/...tion/Service.Analysis/RunScriptService.cs → ...tion/Service.Analysis/RunScriptService.cs b/...tion/Service.Analysis/RunScriptService.cs → ...tion/Service.Analysis/RunScriptService.cs
@@ -1,12 +1,12 @@
 using System.Text;
 using DxWorks.ScriptBee.Plugin.Api;
 using DxWorks.ScriptBee.Plugin.Api.Services;
+using ScriptBee.Analysis;
+using ScriptBee.Artifacts;
 using ScriptBee.Common;
 using ScriptBee.Domain.Model.Analysis;
 using ScriptBee.Domain.Model.File;
 using ScriptBee.Domain.Model.ProjectStructure;
-using ScriptBee.Ports.Analysis;
-using ScriptBee.Ports.Files;
 using ScriptBee.Ports.Plugins;
 
 namespace ScriptBee.Service.Analysis;

diff --git a/ScriptBeeWebApp/src/Analysis/Application/Service.Analysis/Service.Analysis.csproj b/ScriptBeeWebApp/src/Analysis/Application/Service.Analysis/Service.Analysis.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <RootNamespace>ScriptBee.Service.Analysis</RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Common\Common\Common.csproj" />
+    <ProjectReference Include="..\..\..\Workspace\Analysis\Analysis\Analysis.csproj" />
+    <ProjectReference Include="..\..\..\Workspace\Artifacts\Artifacts\Artifacts.csproj" />
+    <ProjectReference Include="..\Ports.Plugins\Ports.Plugins.csproj" />
+    <ProjectReference Include="..\..\Application\UseCases.Analysis\UseCases.Analysis.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/ScriptBeeWebApp/src/Analysis/Application/Service.Plugin/GetAvailablePluginsService.cs b/ScriptBeeWebApp/src/Analysis/Application/Service.Plugin/GetAvailablePluginsService.cs
@@ -1,5 +1,6 @@
 using ScriptBee.Domain.Model.Plugin;
 using ScriptBee.Domain.Model.Plugin.MarketPlace;
+using ScriptBee.Marketplace.Client;
 using ScriptBee.Ports.Plugins;
 using ScriptBee.UseCases.Plugin;
 

diff --git a/ScriptBeeWebApp/src/Analysis/Application/Service.Plugin/Service.Plugin.csproj b/ScriptBeeWebApp/src/Analysis/Application/Service.Plugin/Service.Plugin.csproj
@@ -3,11 +3,12 @@
     <RootNamespace>ScriptBee.Service.Plugin</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Common\Common\Common.csproj" />
-    <ProjectReference Include="..\..\..\Gateway\Application\Ports.Plugins\Ports.Plugins.csproj" />
-    <ProjectReference Include="..\..\..\Gateway\Application\UseCases.Plugin\UseCases.Plugin.csproj" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
+    <ProjectReference Include="..\..\..\Common\Common\Common.csproj" />
+    <ProjectReference Include="..\..\..\Common\Marketplace.Client\Marketplace.Client.csproj" />
+    <ProjectReference Include="..\Ports.Plugins\Ports.Plugins.csproj" />
+    <ProjectReference Include="..\UseCases.Plugin\UseCases.Plugin.csproj" />
   </ItemGroup>
 </Project>
diff --git a/...ses.Plugin/IGetAvailablePluginsUseCase.cs → ...ses.Plugin/IGetAvailablePluginsUseCase.cs b/...ses.Plugin/IGetAvailablePluginsUseCase.cs → ...ses.Plugin/IGetAvailablePluginsUseCase.cs
diff --git a/.../UseCases.Plugin/IInstallPluginUseCase.cs → .../UseCases.Plugin/IInstallPluginUseCase.cs b/.../UseCases.Plugin/IInstallPluginUseCase.cs → .../UseCases.Plugin/IInstallPluginUseCase.cs
diff --git a/.../UseCases.Plugin/IManagePluginsUseCase.cs → .../UseCases.Plugin/IManagePluginsUseCase.cs b/.../UseCases.Plugin/IManagePluginsUseCase.cs → .../UseCases.Plugin/IManagePluginsUseCase.cs
diff --git a/...seCases.Plugin/IUninstallPluginUseCase.cs → ...seCases.Plugin/IUninstallPluginUseCase.cs b/...seCases.Plugin/IUninstallPluginUseCase.cs → ...seCases.Plugin/IUninstallPluginUseCase.cs
diff --git a/...on/UseCases.Plugin/UseCases.Plugin.csproj → ...on/UseCases.Plugin/UseCases.Plugin.csproj b/...on/UseCases.Plugin/UseCases.Plugin.csproj → ...on/UseCases.Plugin/UseCases.Plugin.csproj
diff --git a/...ent/Exceptions/PluginNotFoundException.cs → ...ent/Exceptions/PluginNotFoundException.cs b/...ent/Exceptions/PluginNotFoundException.cs → ...ent/Exceptions/PluginNotFoundException.cs
diff --git a/...eptions/PluginVersionNotFoundException.cs → ...eptions/PluginVersionNotFoundException.cs b/...eptions/PluginVersionNotFoundException.cs → ...eptions/PluginVersionNotFoundException.cs
diff --git a/...ion/Ports.Plugins/IMarketPluginFetcher.cs → ...arketplace.Client/IMarketPluginFetcher.cs b/...ion/Ports.Plugins/IMarketPluginFetcher.cs → ...arketplace.Client/IMarketPluginFetcher.cs
@@ -1,6 +1,6 @@
 using ScriptBee.Domain.Model.Plugin.MarketPlace;
 
-namespace ScriptBee.Ports.Plugins;
+namespace ScriptBee.Marketplace.Client;
 
 public interface IMarketPluginFetcher
 {

diff --git a/...cation/Ports.Plugins/IPluginUrlFetcher.cs → ...n/Marketplace.Client/IPluginUrlFetcher.cs b/...cation/Ports.Plugins/IPluginUrlFetcher.cs → ...n/Marketplace.Client/IPluginUrlFetcher.cs
@@ -1,4 +1,4 @@
-namespace ScriptBee.Ports.Plugins;
+namespace ScriptBee.Marketplace.Client;
 
 public interface IPluginUrlFetcher
 {

diff --git a/...Marketplace.Client/MarketPluginFetcher.cs → ...Marketplace.Client/MarketPluginFetcher.cs b/...Marketplace.Client/MarketPluginFetcher.cs → ...Marketplace.Client/MarketPluginFetcher.cs
@@ -2,7 +2,6 @@
 using DxWorks.Hub.Sdk.Project;
 using ScriptBee.Domain.Model.Plugin;
 using ScriptBee.Domain.Model.Plugin.MarketPlace;
-using ScriptBee.Ports.Plugins;
 
 namespace ScriptBee.Marketplace.Client;
 

diff --git a/...ketplace.Client/Marketplace.Client.csproj → ...ketplace.Client/Marketplace.Client.csproj b/...ketplace.Client/Marketplace.Client.csproj → ...ketplace.Client/Marketplace.Client.csproj
@@ -8,7 +8,6 @@
     <PackageReference Include="Microsoft.Extensions.Http" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Common\Model\Model.csproj" />
-    <ProjectReference Include="..\..\..\Gateway\Application\Ports.Plugins\Ports.Plugins.csproj" />
+    <ProjectReference Include="..\Model\Model.csproj" />
   </ItemGroup>
 </Project>
diff --git a/...rs/Marketplace.Client/PluginUrlFetcher.cs → ...on/Marketplace.Client/PluginUrlFetcher.cs b/...rs/Marketplace.Client/PluginUrlFetcher.cs → ...on/Marketplace.Client/PluginUrlFetcher.cs
@@ -1,5 +1,4 @@
 using ScriptBee.Marketplace.Client.Exceptions;
-using ScriptBee.Ports.Plugins;
 
 namespace ScriptBee.Marketplace.Client;
 

diff --git a/...t/ScriptBeeMarketplaceClientExtensions.cs → ...t/ScriptBeeMarketplaceClientExtensions.cs b/...t/ScriptBeeMarketplaceClientExtensions.cs → ...t/ScriptBeeMarketplaceClientExtensions.cs
@@ -1,6 +1,5 @@
 using DxWorks.Hub.Sdk;
 using Microsoft.Extensions.DependencyInjection;
-using ScriptBee.Ports.Plugins;
 
 namespace ScriptBee.Marketplace.Client;
 

diff --git a/...ons/InvalidMongoConfigurationException.cs → ...ons/InvalidMongoConfigurationException.cs b/...ons/InvalidMongoConfigurationException.cs → ...ons/InvalidMongoConfigurationException.cs
@@ -1,5 +1,6 @@
-namespace ScriptBee.Persistence.Mongodb.Exceptions;
+namespace ScriptBee.Persistence.Mongodb.Exceptions;
 
 [Serializable]
 public sealed class InvalidMongoConfigurationException()
     : Exception("MongoDB connection string is not set");
+
diff --git a/...p/src/Common/Persistence.Mongodb.Abstractions/Extensions/MongoDbAbstractionsExtensions.cs b/...p/src/Common/Persistence.Mongodb.Abstractions/Extensions/MongoDbAbstractionsExtensions.cs
@@ -0,0 +1,43 @@
+using Microsoft.Extensions.DependencyInjection;
+using MongoDB.Driver;
+using ScriptBee.Persistence.Mongodb.Exceptions;
+using ScriptBee.Persistence.Mongodb.Repository;
+
+namespace ScriptBee.Persistence.Mongodb.Extensions;
+
+public static class MongoDbAbstractionsExtensions
+{
+    public static IMongoDatabase AddMongodbDatabase(
+        this IServiceCollection services,
+        string? connectionString
+    )
+    {
+        if (string.IsNullOrEmpty(connectionString))
+        {
+            throw new InvalidMongoConfigurationException();
+        }
+
+        var mongoUrl = new MongoUrl(connectionString);
+        var mongoClient = new MongoClient(mongoUrl);
+        var mongoDatabase = mongoClient.GetDatabase(mongoUrl.DatabaseName);
+
+        services
+            .AddSingleton<IMongoClient>(mongoClient)
+            .AddSingleton(mongoDatabase);
+
+        return mongoDatabase;
+    }
+
+    public static IServiceCollection AddMongoCollection<T>(
+        this IServiceCollection services,
+        IMongoDatabase mongoDatabase,
+        string collectionName
+    )
+        where T : IDocument
+    {
+        return services
+            .AddSingleton<IMongoCollection<T>>(_ => mongoDatabase.GetCollection<T>(collectionName))
+            .AddSingleton<IMongoRepository<T>, MongoRepository<T>>();
+    }
+}
+
diff --git a/...ebApp/src/Common/Persistence.Mongodb.Abstractions/Persistence.Mongodb.Abstractions.csproj b/...ebApp/src/Common/Persistence.Mongodb.Abstractions/Persistence.Mongodb.Abstractions.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <RootNamespace>ScriptBee.Persistence.Mongodb</RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="MongoDB.Bson" />
+    <PackageReference Include="MongoDB.Driver" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Model\Model.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/...rsistence.Mongodb/Repository/IDocument.cs → ...godb.Abstractions/Repository/IDocument.cs b/...rsistence.Mongodb/Repository/IDocument.cs → ...godb.Abstractions/Repository/IDocument.cs
@@ -1,6 +1,7 @@
-namespace ScriptBee.Persistence.Mongodb.Repository;
+namespace ScriptBee.Persistence.Mongodb.Repository;
 
 public interface IDocument
 {
     public string Id { get; set; }
 }
+