diff --git a/src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj b/src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj
index ce4c82d2..ddd39d0c 100644
--- a/src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj
+++ b/src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>$(TargetFramework)</TargetFramework>
diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Helpers/KnowledgeSettingHelper.cs b/src/Infrastructure/BotSharp.Core/Knowledges/Helpers/KnowledgeSettingHelper.cs
similarity index 89%
rename from src/Plugins/BotSharp.Plugin.KnowledgeBase/Helpers/KnowledgeSettingHelper.cs
rename to src/Infrastructure/BotSharp.Core/Knowledges/Helpers/KnowledgeSettingHelper.cs
index 48033c91..a278d7bf 100644
--- a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Helpers/KnowledgeSettingHelper.cs
+++ b/src/Infrastructure/BotSharp.Core/Knowledges/Helpers/KnowledgeSettingHelper.cs
@@ -1,4 +1,7 @@
-namespace BotSharp.Plugin.KnowledgeBase.Helpers;
+using BotSharp.Abstraction.Knowledges.Settings;
+using BotSharp.Abstraction.MLTasks;
+
+namespace BotSharp.Core.Knowledges.Helpers;
 
 public static class KnowledgeSettingHelper
 {
diff --git a/src/Infrastructure/BotSharp.Core/Knowledges/KnowledgeCorePlugin.cs b/src/Infrastructure/BotSharp.Core/Knowledges/KnowledgeCorePlugin.cs
new file mode 100644
index 00000000..6118647b
--- /dev/null
+++ b/src/Infrastructure/BotSharp.Core/Knowledges/KnowledgeCorePlugin.cs
@@ -0,0 +1,19 @@
+using BotSharp.Core.Knowledges.Services;
+using Microsoft.Extensions.Configuration;
+
+namespace BotSharp.Core.Knowledges;
+
+public class KnowledgeCorePlugin : IBotSharpPlugin
+{
+    public string Id => "a5ebc8f9-d089-44d0-bf00-4eac97a050bc";
+
+    public string Name => "Knowledge Core";
+
+    public string Description => "Provides core knowledge services.";
+
+
+    public void RegisterDI(IServiceCollection services, IConfiguration config)
+    {
+        services.AddScoped<IKnowledgeService, KnowledgeService>();
+    }
+}
\ No newline at end of file
diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Create.cs b/src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.Create.cs
similarity index 88%
rename from src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Create.cs
rename to src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.Create.cs
index 1df460a0..2927d952 100644
--- a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Create.cs
+++ b/src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.Create.cs
@@ -1,11 +1,16 @@
-namespace BotSharp.Plugin.KnowledgeBase.Services;
+using BotSharp.Abstraction.Knowledges.Models;
+using BotSharp.Abstraction.VectorStorage.Models;
+
+namespace BotSharp.Core.Knowledges.Services;
 
 public partial class KnowledgeService
 {
     public async Task FeedVectorKnowledge(string collectionName, KnowledgeCreationModel knowledge)
     {
         var index = 0;
-        var lines = _textChopper.Chop(knowledge.Content, new ChunkOption
+
+        var textChopper = _services.GetRequiredService<ITextChopper>();
+        var lines = textChopper.Chop(knowledge.Content, new ChunkOption
         {
             Size = 1024,
             Conjunction = 32,
diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Delete.cs b/src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.Delete.cs
similarity index 95%
rename from src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Delete.cs
rename to src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.Delete.cs
index b0973a99..404b4e2c 100644
--- a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Delete.cs
+++ b/src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.Delete.cs
@@ -1,4 +1,4 @@
-namespace BotSharp.Plugin.KnowledgeBase.Services;
+namespace BotSharp.Core.Knowledges.Services;
 
 public partial class KnowledgeService
 {
diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Get.cs b/src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.Get.cs
similarity index 96%
rename from src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Get.cs
rename to src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.Get.cs
index ee36780e..69093659 100644
--- a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Get.cs
+++ b/src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.Get.cs
@@ -1,6 +1,8 @@
 using BotSharp.Abstraction.Graph.Models;
+using BotSharp.Abstraction.Knowledges.Models;
+using BotSharp.Abstraction.VectorStorage.Models;
 
-namespace BotSharp.Plugin.KnowledgeBase.Services;
+namespace BotSharp.Core.Knowledges.Services;
 
 public partial class KnowledgeService
 {
diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Update.cs b/src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.Update.cs
similarity index 91%
rename from src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Update.cs
rename to src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.Update.cs
index 0fa1f5cd..b9652f61 100644
--- a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Update.cs
+++ b/src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.Update.cs
@@ -1,4 +1,6 @@
-namespace BotSharp.Plugin.KnowledgeBase.Services;
+using BotSharp.Abstraction.VectorStorage.Models;
+
+namespace BotSharp.Core.Knowledges.Services;
 
 public partial class KnowledgeService
 {
diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.cs b/src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.cs
similarity index 80%
rename from src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.cs
rename to src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.cs
index bf597395..2c0853d0 100644
--- a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.cs
+++ b/src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.cs
@@ -1,22 +1,24 @@
+using BotSharp.Abstraction.Graph;
+using BotSharp.Abstraction.Knowledges.Settings;
+using BotSharp.Abstraction.MLTasks;
+using BotSharp.Abstraction.VectorStorage;
+using BotSharp.Core.Knowledges.Helpers;
 
-namespace BotSharp.Plugin.KnowledgeBase.Services;
+namespace BotSharp.Core.Knowledges.Services;
 
 public partial class KnowledgeService : IKnowledgeService
 {
     private readonly IServiceProvider _services;
     private readonly KnowledgeBaseSettings _settings;
-    private readonly ITextChopper _textChopper;
     private readonly ILogger<KnowledgeService> _logger;
 
     public KnowledgeService(
         IServiceProvider services,
         KnowledgeBaseSettings settings,
-        ITextChopper textChopper,
         ILogger<KnowledgeService> logger)
     {
         _services = services;
         _settings = settings;
-        _textChopper = textChopper;
         _logger = logger;
     }
 
diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Functions/KnowledgeRetrievalFn.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Functions/KnowledgeRetrievalFn.cs
index d6d719d7..400b1792 100644
--- a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Functions/KnowledgeRetrievalFn.cs
+++ b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Functions/KnowledgeRetrievalFn.cs
@@ -1,3 +1,5 @@
+using BotSharp.Core.Knowledges.Helpers;
+
 namespace BotSharp.Plugin.KnowledgeBase.Functions;
 
 public class KnowledgeRetrievalFn : IFunctionCallback
diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Functions/MemorizeKnowledgeFn.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Functions/MemorizeKnowledgeFn.cs
index ca545c65..08b55d1c 100644
--- a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Functions/MemorizeKnowledgeFn.cs
+++ b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Functions/MemorizeKnowledgeFn.cs
@@ -1,3 +1,5 @@
+using BotSharp.Core.Knowledges.Helpers;
+
 namespace BotSharp.Plugin.KnowledgeBase.Functions;
 
 public class MemorizeKnowledgeFn : IFunctionCallback
diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/KnowledgeBasePlugin.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/KnowledgeBasePlugin.cs
index 4350e33c..dd864a73 100644
--- a/src/Plugins/BotSharp.Plugin.KnowledgeBase/KnowledgeBasePlugin.cs
+++ b/src/Plugins/BotSharp.Plugin.KnowledgeBase/KnowledgeBasePlugin.cs
@@ -21,7 +21,6 @@ public class KnowledgeBasePlugin : IBotSharpPlugin
         });
 
         services.AddScoped<ITextChopper, TextChopperService>();
-        services.AddScoped<IKnowledgeService, KnowledgeService>();
         services.AddSingleton<IPdf2TextConverter, PigPdf2TextConverter>();
         services.AddScoped<IAgentUtilityHook, KnowledgeBaseUtilityHook>();
         services.AddScoped<IAgentHook, KnowledgeBaseAgentHook>();