diff --git a/EncodingConverter.VisualStudio/EncodingConverter.VisualStudio.csproj b/EncodingConverter.VisualStudio/EncodingConverter.VisualStudio.csproj
index 4902c84..6a1b8e1 100644
--- a/EncodingConverter.VisualStudio/EncodingConverter.VisualStudio.csproj
+++ b/EncodingConverter.VisualStudio/EncodingConverter.VisualStudio.csproj
@@ -106,18 +106,13 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\EncodingConverter\EncodingConverter.csproj">
-      <Project>{4787fd60-29a6-415e-bab9-0b909d0e9f8e}</Project>
-      <Name>EncodingConverter</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <Page Include="Dialogs\ChooseEncodingDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
+  <Import Project="..\EncodingConverter\EncodingConverter.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/EncodingConverter.sln b/EncodingConverter.sln
index 9ef5bd4..4e5ec65 100644
--- a/EncodingConverter.sln
+++ b/EncodingConverter.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.8.34525.116
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EncodingConverter", "EncodingConverter\EncodingConverter.csproj", "{4787FD60-29A6-415E-BAB9-0B909D0E9F8E}"
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "EncodingConverter", "EncodingConverter\EncodingConverter.shproj", "{6BBCF373-019A-4B1A-9143-B6B529BE78A0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EncodingConverter.VisualStudio", "EncodingConverter.VisualStudio\EncodingConverter.VisualStudio.csproj", "{9FFBDABA-E149-4EAF-8E0B-F2C5DFC1AFB5}"
 EndProject
@@ -13,10 +13,6 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4787FD60-29A6-415E-BAB9-0B909D0E9F8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4787FD60-29A6-415E-BAB9-0B909D0E9F8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4787FD60-29A6-415E-BAB9-0B909D0E9F8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4787FD60-29A6-415E-BAB9-0B909D0E9F8E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9FFBDABA-E149-4EAF-8E0B-F2C5DFC1AFB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9FFBDABA-E149-4EAF-8E0B-F2C5DFC1AFB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9FFBDABA-E149-4EAF-8E0B-F2C5DFC1AFB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -28,4 +24,8 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9D84BE0B-2C27-4E57-8517-649E418C5BE2}
 	EndGlobalSection
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		EncodingConverter\EncodingConverter.projitems*{6bbcf373-019a-4b1a-9143-b6b529be78a0}*SharedItemsImports = 13
+		EncodingConverter\EncodingConverter.projitems*{9ffbdaba-e149-4eaf-8e0b-f2c5dfc1afb5}*SharedItemsImports = 4
+	EndGlobalSection
 EndGlobal
diff --git a/EncodingConverter/EncodingConverter.csproj b/EncodingConverter/EncodingConverter.csproj
deleted file mode 100644
index eec2689..0000000
--- a/EncodingConverter/EncodingConverter.csproj
+++ /dev/null
@@ -1,6 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/EncodingConverter/EncodingConverter.projitems b/EncodingConverter/EncodingConverter.projitems
new file mode 100644
index 0000000..b6dfbcb
--- /dev/null
+++ b/EncodingConverter/EncodingConverter.projitems
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>6bbcf373-019a-4b1a-9143-b6b529be78a0</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>EncodingConverter</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)ConverterCore.cs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/EncodingConverter/EncodingConverter.shproj b/EncodingConverter/EncodingConverter.shproj
new file mode 100644
index 0000000..d15193d
--- /dev/null
+++ b/EncodingConverter/EncodingConverter.shproj
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>6bbcf373-019a-4b1a-9143-b6b529be78a0</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="EncodingConverter.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>