diff --git a/BotSharp.Platform.Abstraction/IAgentImporter.cs b/BotSharp.Core/Abstractions/IAgentImporter.cs
similarity index 100%
rename from BotSharp.Platform.Abstraction/IAgentImporter.cs
rename to BotSharp.Core/Abstractions/IAgentImporter.cs
diff --git a/BotSharp.Platform.Abstraction/IAgentStorage.cs b/BotSharp.Core/Abstractions/IAgentStorage.cs
similarity index 100%
rename from BotSharp.Platform.Abstraction/IAgentStorage.cs
rename to BotSharp.Core/Abstractions/IAgentStorage.cs
diff --git a/BotSharp.Platform.Abstraction/IAgentStorageFactory.cs b/BotSharp.Core/Abstractions/IAgentStorageFactory.cs
similarity index 100%
rename from BotSharp.Platform.Abstraction/IAgentStorageFactory.cs
rename to BotSharp.Core/Abstractions/IAgentStorageFactory.cs
diff --git a/BotSharp.Platform.Abstraction/IBotEngine.cs b/BotSharp.Core/Abstractions/IBotEngine.cs
similarity index 100%
rename from BotSharp.Platform.Abstraction/IBotEngine.cs
rename to BotSharp.Core/Abstractions/IBotEngine.cs
diff --git a/BotSharp.Platform.Abstraction/IContextStorage.cs b/BotSharp.Core/Abstractions/IContextStorage.cs
similarity index 100%
rename from BotSharp.Platform.Abstraction/IContextStorage.cs
rename to BotSharp.Core/Abstractions/IContextStorage.cs
diff --git a/BotSharp.Platform.Abstraction/IContextStorageFactory.cs b/BotSharp.Core/Abstractions/IContextStorageFactory.cs
similarity index 100%
rename from BotSharp.Platform.Abstraction/IContextStorageFactory.cs
rename to BotSharp.Core/Abstractions/IContextStorageFactory.cs
diff --git a/BotSharp.Platform.Abstraction/IPlatformBuilder.cs b/BotSharp.Core/Abstractions/IPlatformBuilder.cs
similarity index 100%
rename from BotSharp.Platform.Abstraction/IPlatformBuilder.cs
rename to BotSharp.Core/Abstractions/IPlatformBuilder.cs
diff --git a/BotSharp.Platform.Abstraction/IPlatformSettings.cs b/BotSharp.Core/Abstractions/IPlatformSettings.cs
similarity index 100%
rename from BotSharp.Platform.Abstraction/IPlatformSettings.cs
rename to BotSharp.Core/Abstractions/IPlatformSettings.cs
diff --git a/BotSharp.Core/BotSharp.Core.csproj b/BotSharp.Core/BotSharp.Core.csproj
index b891105d..12d7e765 100644
--- a/BotSharp.Core/BotSharp.Core.csproj
+++ b/BotSharp.Core/BotSharp.Core.csproj
@@ -72,23 +72,17 @@ If you feel that this project is helpful to you, please Star on the project, we
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BotSharp.Platform.Abstraction" Version="0.3.0" />
-    <PackageReference Include="BotSharp.Platform.Models" Version="0.3.0" />
     <PackageReference Include="CherubNLP" Version="0.1.1" />
     <PackageReference Include="Colorful.Console" Version="1.2.9" />
-    <PackageReference Include="CSRedisCore" Version="3.0.37" />
+    <PackageReference Include="CSRedisCore" Version="3.0.39" />
     <PackageReference Include="DotNetToolkit" Version="1.6.0" />
     <PackageReference Include="EntityFrameworkCore.BootKit" Version="1.11.0" />
     <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-    <PackageReference Include="NumSharp" Version="0.7.2" />
+    <PackageReference Include="NumSharp" Version="0.7.3" />
     <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\BotSharp.Platform.Abstraction\BotSharp.Platform.Abstraction.csproj" />
-    <ProjectReference Include="..\BotSharp.Platform.Models\BotSharp.Platform.Models.csproj" />
+    <PackageReference Include="TensorFlow.NET" Version="0.4.0" />
   </ItemGroup>
 
 </Project>
diff --git a/BotSharp.Platform.Models/AIResponseMessageType.cs b/BotSharp.Core/Models/AIResponseMessageType.cs
similarity index 100%
rename from BotSharp.Platform.Models/AIResponseMessageType.cs
rename to BotSharp.Core/Models/AIResponseMessageType.cs
diff --git a/BotSharp.Platform.Models/AgentBase.cs b/BotSharp.Core/Models/AgentBase.cs
similarity index 100%
rename from BotSharp.Platform.Models/AgentBase.cs
rename to BotSharp.Core/Models/AgentBase.cs
diff --git a/BotSharp.Platform.Models/AgentImportHeader.cs b/BotSharp.Core/Models/AgentImportHeader.cs
similarity index 100%
rename from BotSharp.Platform.Models/AgentImportHeader.cs
rename to BotSharp.Core/Models/AgentImportHeader.cs
diff --git a/BotSharp.Platform.Models/AgentIntegration.cs b/BotSharp.Core/Models/AgentIntegration.cs
similarity index 100%
rename from BotSharp.Platform.Models/AgentIntegration.cs
rename to BotSharp.Core/Models/AgentIntegration.cs
diff --git a/BotSharp.Platform.Models/Agents/ImportedAgentViewModel.cs b/BotSharp.Core/Models/Agents/ImportedAgentViewModel.cs
similarity index 100%
rename from BotSharp.Platform.Models/Agents/ImportedAgentViewModel.cs
rename to BotSharp.Core/Models/Agents/ImportedAgentViewModel.cs
diff --git a/BotSharp.Platform.Models/AiRequest/AIRequest.cs b/BotSharp.Core/Models/AiRequest/AIRequest.cs
similarity index 100%
rename from BotSharp.Platform.Models/AiRequest/AIRequest.cs
rename to BotSharp.Core/Models/AiRequest/AIRequest.cs
diff --git a/BotSharp.Platform.Models/AiResponse/AIResponse.cs b/BotSharp.Core/Models/AiResponse/AIResponse.cs
similarity index 100%
rename from BotSharp.Platform.Models/AiResponse/AIResponse.cs
rename to BotSharp.Core/Models/AiResponse/AIResponse.cs
diff --git a/BotSharp.Platform.Models/AiResponse/ResponseParameterPrompt.cs b/BotSharp.Core/Models/AiResponse/ResponseParameterPrompt.cs
similarity index 100%
rename from BotSharp.Platform.Models/AiResponse/ResponseParameterPrompt.cs
rename to BotSharp.Core/Models/AiResponse/ResponseParameterPrompt.cs
diff --git a/BotSharp.Platform.Models/AiResponse/TextClassificationResult.cs b/BotSharp.Core/Models/AiResponse/TextClassificationResult.cs
similarity index 100%
rename from BotSharp.Platform.Models/AiResponse/TextClassificationResult.cs
rename to BotSharp.Core/Models/AiResponse/TextClassificationResult.cs
diff --git a/BotSharp.Platform.Models/BotTrainOptions.cs b/BotSharp.Core/Models/BotTrainOptions.cs
similarity index 100%
rename from BotSharp.Platform.Models/BotTrainOptions.cs
rename to BotSharp.Core/Models/BotTrainOptions.cs
diff --git a/BotSharp.Platform.Models/Contexts/AIContext.cs b/BotSharp.Core/Models/Contexts/AIContext.cs
similarity index 100%
rename from BotSharp.Platform.Models/Contexts/AIContext.cs
rename to BotSharp.Core/Models/Contexts/AIContext.cs
diff --git a/BotSharp.Platform.Models/Entities/NlpEntity.cs b/BotSharp.Core/Models/Entities/NlpEntity.cs
similarity index 100%
rename from BotSharp.Platform.Models/Entities/NlpEntity.cs
rename to BotSharp.Core/Models/Entities/NlpEntity.cs
diff --git a/BotSharp.Platform.Models/EntityBase.cs b/BotSharp.Core/Models/EntityBase.cs
similarity index 100%
rename from BotSharp.Platform.Models/EntityBase.cs
rename to BotSharp.Core/Models/EntityBase.cs
diff --git a/BotSharp.Platform.Models/IntentBase.cs b/BotSharp.Core/Models/IntentBase.cs
similarity index 100%
rename from BotSharp.Platform.Models/IntentBase.cs
rename to BotSharp.Core/Models/IntentBase.cs
diff --git a/BotSharp.Platform.Models/IntentResponseBase.cs b/BotSharp.Core/Models/IntentResponseBase.cs
similarity index 100%
rename from BotSharp.Platform.Models/IntentResponseBase.cs
rename to BotSharp.Core/Models/IntentResponseBase.cs
diff --git a/BotSharp.Platform.Models/Intents/Intent.cs b/BotSharp.Core/Models/Intents/Intent.cs
similarity index 100%
rename from BotSharp.Platform.Models/Intents/Intent.cs
rename to BotSharp.Core/Models/Intents/Intent.cs
diff --git a/BotSharp.Platform.Models/Intents/IntentEvent.cs b/BotSharp.Core/Models/Intents/IntentEvent.cs
similarity index 100%
rename from BotSharp.Platform.Models/Intents/IntentEvent.cs
rename to BotSharp.Core/Models/Intents/IntentEvent.cs
diff --git a/BotSharp.Platform.Models/Intents/IntentExpression.cs b/BotSharp.Core/Models/Intents/IntentExpression.cs
similarity index 100%
rename from BotSharp.Platform.Models/Intents/IntentExpression.cs
rename to BotSharp.Core/Models/Intents/IntentExpression.cs
diff --git a/BotSharp.Platform.Models/Intents/IntentExpressionPart.cs b/BotSharp.Core/Models/Intents/IntentExpressionPart.cs
similarity index 100%
rename from BotSharp.Platform.Models/Intents/IntentExpressionPart.cs
rename to BotSharp.Core/Models/Intents/IntentExpressionPart.cs
diff --git a/BotSharp.Platform.Models/Intents/IntentInputContext.cs b/BotSharp.Core/Models/Intents/IntentInputContext.cs
similarity index 100%
rename from BotSharp.Platform.Models/Intents/IntentInputContext.cs
rename to BotSharp.Core/Models/Intents/IntentInputContext.cs
diff --git a/BotSharp.Platform.Models/Intents/IntentResponse.cs b/BotSharp.Core/Models/Intents/IntentResponse.cs
similarity index 100%
rename from BotSharp.Platform.Models/Intents/IntentResponse.cs
rename to BotSharp.Core/Models/Intents/IntentResponse.cs
diff --git a/BotSharp.Platform.Models/Intents/IntentResponseContext.cs b/BotSharp.Core/Models/Intents/IntentResponseContext.cs
similarity index 100%
rename from BotSharp.Platform.Models/Intents/IntentResponseContext.cs
rename to BotSharp.Core/Models/Intents/IntentResponseContext.cs
diff --git a/BotSharp.Platform.Models/Intents/IntentResponseMessage.cs b/BotSharp.Core/Models/Intents/IntentResponseMessage.cs
similarity index 100%
rename from BotSharp.Platform.Models/Intents/IntentResponseMessage.cs
rename to BotSharp.Core/Models/Intents/IntentResponseMessage.cs
diff --git a/BotSharp.Platform.Models/Intents/IntentResponseParameter.cs b/BotSharp.Core/Models/Intents/IntentResponseParameter.cs
similarity index 100%
rename from BotSharp.Platform.Models/Intents/IntentResponseParameter.cs
rename to BotSharp.Core/Models/Intents/IntentResponseParameter.cs
diff --git a/BotSharp.Platform.Models/MachineLearning/AgentMlConfig.cs b/BotSharp.Core/Models/MachineLearning/AgentMlConfig.cs
similarity index 100%
rename from BotSharp.Platform.Models/MachineLearning/AgentMlConfig.cs
rename to BotSharp.Core/Models/MachineLearning/AgentMlConfig.cs
diff --git a/BotSharp.Platform.Models/MachineLearning/ModelMetaData.cs b/BotSharp.Core/Models/MachineLearning/ModelMetaData.cs
similarity index 100%
rename from BotSharp.Platform.Models/MachineLearning/ModelMetaData.cs
rename to BotSharp.Core/Models/MachineLearning/ModelMetaData.cs
diff --git a/BotSharp.Platform.Models/MachineLearning/PipeModel.cs b/BotSharp.Core/Models/MachineLearning/PipeModel.cs
similarity index 100%
rename from BotSharp.Platform.Models/MachineLearning/PipeModel.cs
rename to BotSharp.Core/Models/MachineLearning/PipeModel.cs
diff --git a/BotSharp.Platform.Models/PlatformType.cs b/BotSharp.Core/Models/PlatformType.cs
similarity index 100%
rename from BotSharp.Platform.Models/PlatformType.cs
rename to BotSharp.Core/Models/PlatformType.cs
diff --git a/BotSharp.Platform.Models/TrainingCorpus.cs b/BotSharp.Core/Models/TrainingCorpus.cs
similarity index 100%
rename from BotSharp.Platform.Models/TrainingCorpus.cs
rename to BotSharp.Core/Models/TrainingCorpus.cs
diff --git a/BotSharp.Platform.Models/TrainingEntity.cs b/BotSharp.Core/Models/TrainingEntity.cs
similarity index 100%
rename from BotSharp.Platform.Models/TrainingEntity.cs
rename to BotSharp.Core/Models/TrainingEntity.cs
diff --git a/BotSharp.Platform.Models/TrainingEntitySynonym.cs b/BotSharp.Core/Models/TrainingEntitySynonym.cs
similarity index 100%
rename from BotSharp.Platform.Models/TrainingEntitySynonym.cs
rename to BotSharp.Core/Models/TrainingEntitySynonym.cs
diff --git a/BotSharp.Platform.Models/TrainingIntentExpression.cs b/BotSharp.Core/Models/TrainingIntentExpression.cs
similarity index 100%
rename from BotSharp.Platform.Models/TrainingIntentExpression.cs
rename to BotSharp.Core/Models/TrainingIntentExpression.cs
diff --git a/BotSharp.Platform.Models/TrainingIntentExpressionPart.cs b/BotSharp.Core/Models/TrainingIntentExpressionPart.cs
similarity index 100%
rename from BotSharp.Platform.Models/TrainingIntentExpressionPart.cs
rename to BotSharp.Core/Models/TrainingIntentExpressionPart.cs
diff --git a/BotSharp.sln b/BotSharp.sln
index 1a8899ab..6ee9873c 100644
--- a/BotSharp.sln
+++ b/BotSharp.sln
@@ -6,17 +6,9 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BotSharp.Core", "BotSharp.Core\BotSharp.Core.csproj", "{95780673-2A1A-4953-962F-C46CBFDD07FF}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BotSharp.WebHost", "BotSharp.WebHost\BotSharp.WebHost.csproj", "{03DCA427-327A-4FC9-9A2F-57D17F16708C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{62F08F9F-16C2-4754-90B0-B604DC18AE23} = {62F08F9F-16C2-4754-90B0-B604DC18AE23}
-		{C4F2EAE5-F2C7-4F52-9DB2-7E76D7080C72} = {C4F2EAE5-F2C7-4F52-9DB2-7E76D7080C72}
-	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BotSharp.Core.UnitTest", "BotSharp.Core.UnitTest\BotSharp.Core.UnitTest.csproj", "{30F80E7D-951A-4E8F-9C3C-2C866528EABD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BotSharp.Platform.Abstraction", "BotSharp.Platform.Abstraction\BotSharp.Platform.Abstraction.csproj", "{62F08F9F-16C2-4754-90B0-B604DC18AE23}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BotSharp.Platform.Models", "BotSharp.Platform.Models\BotSharp.Platform.Models.csproj", "{C4F2EAE5-F2C7-4F52-9DB2-7E76D7080C72}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BotSharp.Platform.Dialogflow", "BotSharp.Platform.Dialogflow\BotSharp.Platform.Dialogflow.csproj", "{8C82E35D-DC94-45C9-90FD-1FF62E75CD9B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BotSharp.Channel.Weixin", "BotSharp.Channel.Weixin\BotSharp.Channel.Weixin.csproj", "{D93BD270-10A6-4EFB-938D-508FD2EAC1E0}"
@@ -57,22 +49,6 @@ Global
 		{30F80E7D-951A-4E8F-9C3C-2C866528EABD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{30F80E7D-951A-4E8F-9C3C-2C866528EABD}.Release|x64.ActiveCfg = Release|x64
 		{30F80E7D-951A-4E8F-9C3C-2C866528EABD}.Release|x64.Build.0 = Release|x64
-		{62F08F9F-16C2-4754-90B0-B604DC18AE23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{62F08F9F-16C2-4754-90B0-B604DC18AE23}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{62F08F9F-16C2-4754-90B0-B604DC18AE23}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{62F08F9F-16C2-4754-90B0-B604DC18AE23}.Debug|x64.Build.0 = Debug|Any CPU
-		{62F08F9F-16C2-4754-90B0-B604DC18AE23}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{62F08F9F-16C2-4754-90B0-B604DC18AE23}.Release|Any CPU.Build.0 = Release|Any CPU
-		{62F08F9F-16C2-4754-90B0-B604DC18AE23}.Release|x64.ActiveCfg = Release|Any CPU
-		{62F08F9F-16C2-4754-90B0-B604DC18AE23}.Release|x64.Build.0 = Release|Any CPU
-		{C4F2EAE5-F2C7-4F52-9DB2-7E76D7080C72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C4F2EAE5-F2C7-4F52-9DB2-7E76D7080C72}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C4F2EAE5-F2C7-4F52-9DB2-7E76D7080C72}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C4F2EAE5-F2C7-4F52-9DB2-7E76D7080C72}.Debug|x64.Build.0 = Debug|Any CPU
-		{C4F2EAE5-F2C7-4F52-9DB2-7E76D7080C72}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C4F2EAE5-F2C7-4F52-9DB2-7E76D7080C72}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C4F2EAE5-F2C7-4F52-9DB2-7E76D7080C72}.Release|x64.ActiveCfg = Release|Any CPU
-		{C4F2EAE5-F2C7-4F52-9DB2-7E76D7080C72}.Release|x64.Build.0 = Release|Any CPU
 		{8C82E35D-DC94-45C9-90FD-1FF62E75CD9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8C82E35D-DC94-45C9-90FD-1FF62E75CD9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8C82E35D-DC94-45C9-90FD-1FF62E75CD9B}.Debug|x64.ActiveCfg = Debug|Any CPU