diff --git a/TelegramBaseTest/TelegramBaseTest.csproj b/TelegramBaseTest/TelegramBaseTest.csproj
index f5cf6ea..2f4069c 100644
--- a/TelegramBaseTest/TelegramBaseTest.csproj
+++ b/TelegramBaseTest/TelegramBaseTest.csproj
@@ -1,18 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{5817184C-0D59-4924-AC6C-6B943967811C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>TelegramBaseTest</RootNamespace>
-    <AssemblyName>TelegramBaseTest</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <TargetFrameworkProfile />
+    <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -33,77 +25,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Net45|AnyCPU'">
-    <OutputPath>bin\Release Net45\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Telegram.Bot, Version=14.12.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Telegram.Bot.14.12.0\lib\net45\Telegram.Bot.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\TelegramBotBase\TelegramBotBase.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Tests\ButtonTestForm.cs" />
-    <Compile Include="Tests\Controls\ButtonGridForm.cs" />
-    <Compile Include="Tests\Controls\CalendarPickerForm.cs" />
-    <Compile Include="Tests\Controls\MonthPickerForm.cs" />
-    <Compile Include="Tests\Controls\ToggleButtons.cs" />
-    <Compile Include="Tests\Controls\TreeViewForms.cs" />
-    <Compile Include="Tests\DataForm.cs" />
-    <Compile Include="Tests\ProgressTest.cs" />
-    <Compile Include="Tests\Register\PerForm.cs" />
-    <Compile Include="Tests\Register\PerStep.cs" />
-    <Compile Include="Tests\Register\Start.cs" />
-    <Compile Include="Tests\Register\Steps\Data.cs" />
-    <Compile Include="Tests\Register\Steps\Step3.cs" />
-    <Compile Include="Tests\Register\Steps\Step2.cs" />
-    <Compile Include="Tests\Register\Steps\Step1.cs" />
-    <Compile Include="Tests\SimpleForm.cs" />
-    <Compile Include="Tests\Start.cs" />
-    <Compile Include="Tests\TestForm.cs" />
-    <Compile Include="Tests\TestForm2.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\TelegramBotBase\TelegramBotBase.csproj">
-      <Project>{a61eda27-cfdf-4bcb-b2d6-184f94904f2d}</Project>
-      <Name>TelegramBotBase</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/TelegramBotBase/Properties/AssemblyInfo.cs b/TelegramBotBase/Properties/AssemblyInfo.cs
index 423f700..6c8be64 100644
--- a/TelegramBotBase/Properties/AssemblyInfo.cs
+++ b/TelegramBotBase/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.2.0")]
-[assembly: AssemblyFileVersion("1.5.2.0")]
+[assembly: AssemblyVersion("2.0.0.0")]
+[assembly: AssemblyFileVersion("2.0.0.0")]
diff --git a/TelegramBotBase/TelegramBotBase.csproj b/TelegramBotBase/TelegramBotBase.csproj
index abc7674..3aa90cd 100644
--- a/TelegramBotBase/TelegramBotBase.csproj
+++ b/TelegramBotBase/TelegramBotBase.csproj
@@ -1,18 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{A61EDA27-CFDF-4BCB-B2D6-184F94904F2D}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>TelegramBotBase</RootNamespace>
-    <AssemblyName>TelegramBotBase</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
+    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+    <PackageProjectUrl>https://github.com/MajMcCloud/TelegramBotFramework</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/MajMcCloud/TelegramBotFramework</RepositoryUrl>
+    <PackageReleaseNotes>- moving from .Net Framework 4.7.2 to  .Net Standard 2.1 for the Library and .Net Core 3.0 for the test project!</PackageReleaseNotes>
+    <Configurations>Debug;Release;</Configurations>
   </PropertyGroup>
+
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -22,6 +20,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
@@ -31,96 +30,43 @@
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Release\TelegramBotBase.xml</DocumentationFile>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release Net45|AnyCPU' ">
+
+
+
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\net45\</OutputPath>
+    <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
-    <DocumentationFile>bin\Release\net45\TelegramBotBase.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <DocumentationFile>bin\Release\TelegramBotBase.xml</DocumentationFile>
   </PropertyGroup>
+
+
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
+    <Compile Remove="Archive\**" />
+    <EmbeddedResource Remove="Archive\**" />
+    <None Remove="Archive\**" />
   </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="Base\Async.cs" />
-    <Compile Include="Base\ButtonClickedEventArgs.cs" />
-    <Compile Include="Base\ControlBase.cs" />
-    <Compile Include="Base\DataResult.cs" />
-    <Compile Include="Base\InitEventArgs.cs" />
-    <Compile Include="Base\MessageClient.cs" />
-    <Compile Include="Base\MessageIncomeResult.cs" />
-    <Compile Include="Base\MessageReceivedEventArgs.cs" />
-    <Compile Include="Base\MessageResult.cs" />
-    <Compile Include="Base\MessageSentEventArgs.cs" />
-    <Compile Include="Base\ResultBase.cs" />
-    <Compile Include="Base\SessionBeginResult.cs" />
-    <Compile Include="Base\SystemExceptionEventArgs.cs" />
-    <Compile Include="Base\UnhandledCallEventArgs.cs" />
-    <Compile Include="Base\SystemCallEventArgs.cs" />
-    <Compile Include="BotBase.cs" />
-    <Compile Include="Constants\Telegram.cs" />
-    <Compile Include="Controls\ButtonGrid.cs" />
-    <Compile Include="Controls\CalendarPicker.cs" />
-    <Compile Include="Controls\MonthPicker.cs" />
-    <Compile Include="Controls\ProgressBar.cs" />
-    <Compile Include="Controls\ToggleButton.cs" />
-    <Compile Include="Controls\TreeView.cs" />
-    <Compile Include="Controls\TreeViewNode.cs" />
-    <Compile Include="Enums\eDeleteMode.cs" />
-    <Compile Include="Enums\eDeleteSide.cs" />
-    <Compile Include="Enums\eKeyboardType.cs" />
-    <Compile Include="Enums\eMonthPickerMode.cs" />
-    <Compile Include="Exceptions\MaxLengthException.cs" />
-    <Compile Include="Form\AlertDialog.cs" />
-    <Compile Include="Form\ArrayPromptDialog.cs" />
-    <Compile Include="Form\AutoCleanForm.cs" />
-    <Compile Include="Form\ButtonBase.cs" />
-    <Compile Include="Form\ButtonForm.cs" />
-    <Compile Include="Base\FormBase.cs" />
-    <Compile Include="Form\CallbackData.cs" />
-    <Compile Include="Form\PromptDialog.cs" />
-    <Compile Include="Markdown\Generator.cs" />
-    <Compile Include="SessionBase.cs" />
-    <Compile Include="Sessions\DeviceSession.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Tools\Arrays.cs" />
-    <Compile Include="Tools\Time.cs" />
-    <Compile Include="Tools\Images.cs" />
+    <None Remove="cpack.ps1" />
+    <None Remove="cpush.ps1" />
+    <None Remove="nuget.exe" />
+    <None Remove="TelegramBotBase.1.5.0.nupkg" />
+    <None Remove="TelegramBotBase.1.5.0.zip" />
+    <None Remove="TelegramBotBase.1.5.1.nupkg" />
+    <None Remove="TelegramBotBase.1.5.1.zip" />
+    <None Remove="TelegramBotBase.1.5.2.nupkg" />
+    <None Remove="TelegramBotBase.1.5.2.zip" />
+    <None Remove="TelegramBotBase.nuspec" />
   </ItemGroup>
+
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json">
-      <Version>12.0.2</Version>
-    </PackageReference>
-    <PackageReference Include="System.Net.Requests">
-      <Version>4.3.0</Version>
-    </PackageReference>
-    <PackageReference Include="Telegram.Bot">
-      <Version>15.0.0</Version>
-    </PackageReference>
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="System.Drawing.Common" Version="4.6.0" />
+    <PackageReference Include="Telegram.Bot" Version="15.0.0" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/TelegramBotBase/TelegramBotBase.nuspec b/TelegramBotBase/TelegramBotBase.nuspec
index ecece01..cd83738 100644
--- a/TelegramBotBase/TelegramBotBase.nuspec
+++ b/TelegramBotBase/TelegramBotBase.nuspec
@@ -10,12 +10,15 @@
     <projectUrl>https://github.com/MajMcCloud/TelegramBotFramework</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>$description$</description>
-    <releaseNotes>First release on nuget for easier use.</releaseNotes>
+    <releaseNotes>This is a context based application framework for the C# TelegramBot library.</releaseNotes>
     <copyright>Copyright 2019</copyright>
     <tags>Telegram Bot Framework C# Addon Context Modules</tags>
     <dependencies>
       <dependency id="Telegram.Bot" version="14.3.0" />
       <dependency id="Newtonsoft.Json" version="11.0.2" />
+      <dependency id="System.Net.Requests" version="4.3.0" />
     </dependencies>
+   <repository type="git"
+               url="https://github.com/MajMcCloud/TelegramBotFramework" />
   </metadata>
 </package>
\ No newline at end of file
diff --git a/TelegramBotFramework.sln b/TelegramBotFramework.sln
index 4470ccb..fb23ff8 100644
--- a/TelegramBotFramework.sln
+++ b/TelegramBotFramework.sln
@@ -1,40 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
-VisualStudioVersion = 16.0.29025.244
+VisualStudioVersion = 16.0.29324.140
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TelegramBaseTest", "TelegramBaseTest\TelegramBaseTest.csproj", "{5817184C-0D59-4924-AC6C-6B943967811C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TelegramBotBase", "TelegramBotBase\TelegramBotBase.csproj", "{0BD16FB9-7ED4-4CCB-83EB-5CEE538E1B6C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TelegramBotBase", "TelegramBotBase\TelegramBotBase.csproj", "{A61EDA27-CFDF-4BCB-B2D6-184F94904F2D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E9AE1280-C1F3-4960-9D3D-D4F25142E838}"
-	ProjectSection(SolutionItems) = preProject
-		README.md = README.md
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "images", "images", "{AF4C8238-A0F0-41AC-8C0A-33E143AEBFCD}"
-	ProjectSection(SolutionItems) = preProject
-		images\alertdialog.PNG = images\alertdialog.PNG
-		images\buttongrid.gif = images\buttongrid.gif
-		images\calendarpicker.gif = images\calendarpicker.gif
-		images\calendarpicker.PNG = images\calendarpicker.PNG
-		images\example1.PNG = images\example1.PNG
-		images\example2.PNG = images\example2.PNG
-		images\example3.PNG = images\example3.PNG
-		images\example4.1.PNG = images\example4.1.PNG
-		images\example4.2.PNG = images\example4.2.PNG
-		images\example4.3.PNG = images\example4.3.PNG
-		images\example4.4.PNG = images\example4.4.PNG
-		images\monthpicker1.PNG = images\monthpicker1.PNG
-		images\monthpicker2.PNG = images\monthpicker2.PNG
-		images\progressbar.PNG = images\progressbar.PNG
-		images\promptdialog.PNG = images\promptdialog.PNG
-		images\togglebutton.gif = images\togglebutton.gif
-		images\treeview1.PNG = images\treeview1.PNG
-		images\treeview2.PNG = images\treeview2.PNG
-		images\treeview3.PNG = images\treeview3.PNG
-		images\treeview4.PNG = images\treeview4.PNG
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TelegramBaseTest", "TelegramBaseTest\TelegramBaseTest.csproj", "{9BBFA9F7-64A7-4D7D-86FC-812E6D7578B8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -42,22 +13,19 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5817184C-0D59-4924-AC6C-6B943967811C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5817184C-0D59-4924-AC6C-6B943967811C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5817184C-0D59-4924-AC6C-6B943967811C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5817184C-0D59-4924-AC6C-6B943967811C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A61EDA27-CFDF-4BCB-B2D6-184F94904F2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A61EDA27-CFDF-4BCB-B2D6-184F94904F2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A61EDA27-CFDF-4BCB-B2D6-184F94904F2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A61EDA27-CFDF-4BCB-B2D6-184F94904F2D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0BD16FB9-7ED4-4CCB-83EB-5CEE538E1B6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0BD16FB9-7ED4-4CCB-83EB-5CEE538E1B6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0BD16FB9-7ED4-4CCB-83EB-5CEE538E1B6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0BD16FB9-7ED4-4CCB-83EB-5CEE538E1B6C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9BBFA9F7-64A7-4D7D-86FC-812E6D7578B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9BBFA9F7-64A7-4D7D-86FC-812E6D7578B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9BBFA9F7-64A7-4D7D-86FC-812E6D7578B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9BBFA9F7-64A7-4D7D-86FC-812E6D7578B8}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{AF4C8238-A0F0-41AC-8C0A-33E143AEBFCD} = {E9AE1280-C1F3-4960-9D3D-D4F25142E838}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {4245F162-E263-45E0-A16A-ED5F411A4AFC}
+		SolutionGuid = {59CB40E1-9FA7-4867-A56F-4F418286F057}
 	EndGlobalSection
 EndGlobal