diff --git a/Directory.Build.props b/Directory.Build.props
deleted file mode 100644
index 232afa3..0000000
--- a/Directory.Build.props
+++ /dev/null
@@ -1,6 +0,0 @@
-<Project>
-    <PropertyGroup Label="Assembly signing">
-        <AssemblyOriginatorKeyFile>$(SolutionDir)StringSimilarity.NET.snk</AssemblyOriginatorKeyFile>
-        <SignAssembly>true</SignAssembly>
-    </PropertyGroup>
-</Project>
diff --git a/F23.StringSimilarity.sln b/F23.StringSimilarity.sln
deleted file mode 100644
index 148038f..0000000
--- a/F23.StringSimilarity.sln
+++ /dev/null
@@ -1,34 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "F23.StringSimilarity", "src\F23.StringSimilarity\F23.StringSimilarity.csproj", "{FA27327B-BCCC-46C7-8EED-BBD1ECF4BF53}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "F23.StringSimilarity.Tests", "test\F23.StringSimilarity.Tests\F23.StringSimilarity.Tests.csproj", "{68F339E6-278F-4B04-A6ED-422AAD30591F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "F23.StringSimilarity.Benchmarks", "test\F23.StringSimilarity.Benchmarks\F23.StringSimilarity.Benchmarks.csproj", "{3A9605B1-820C-43C2-8F9B-72BCA5F5543B}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{FA27327B-BCCC-46C7-8EED-BBD1ECF4BF53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA27327B-BCCC-46C7-8EED-BBD1ECF4BF53}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA27327B-BCCC-46C7-8EED-BBD1ECF4BF53}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA27327B-BCCC-46C7-8EED-BBD1ECF4BF53}.Release|Any CPU.Build.0 = Release|Any CPU
-		{68F339E6-278F-4B04-A6ED-422AAD30591F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{68F339E6-278F-4B04-A6ED-422AAD30591F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{68F339E6-278F-4B04-A6ED-422AAD30591F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{68F339E6-278F-4B04-A6ED-422AAD30591F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A9605B1-820C-43C2-8F9B-72BCA5F5543B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A9605B1-820C-43C2-8F9B-72BCA5F5543B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A9605B1-820C-43C2-8F9B-72BCA5F5543B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A9605B1-820C-43C2-8F9B-72BCA5F5543B}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/F23.StringSimilarity.slnx b/F23.StringSimilarity.slnx
new file mode 100644
index 0000000..52b49bc
--- /dev/null
+++ b/F23.StringSimilarity.slnx
@@ -0,0 +1,5 @@
+<Solution>
+  <Project Path="benchmarks/F23.StringSimilarity.Benchmarks/F23.StringSimilarity.Benchmarks.csproj" />
+  <Project Path="src/F23.StringSimilarity/F23.StringSimilarity.csproj" />
+  <Project Path="test/F23.StringSimilarity.Tests/F23.StringSimilarity.Tests.csproj" />
+</Solution>
diff --git a/test/F23.StringSimilarity.Benchmarks/Benchmarks.cs b/benchmarks/F23.StringSimilarity.Benchmarks/Benchmarks.cs
similarity index 100%
rename from test/F23.StringSimilarity.Benchmarks/Benchmarks.cs
rename to benchmarks/F23.StringSimilarity.Benchmarks/Benchmarks.cs
diff --git a/test/F23.StringSimilarity.Benchmarks/F23.StringSimilarity.Benchmarks.csproj b/benchmarks/F23.StringSimilarity.Benchmarks/F23.StringSimilarity.Benchmarks.csproj
similarity index 77%
rename from test/F23.StringSimilarity.Benchmarks/F23.StringSimilarity.Benchmarks.csproj
rename to benchmarks/F23.StringSimilarity.Benchmarks/F23.StringSimilarity.Benchmarks.csproj
index 8035ce4..c838a74 100644
--- a/test/F23.StringSimilarity.Benchmarks/F23.StringSimilarity.Benchmarks.csproj
+++ b/benchmarks/F23.StringSimilarity.Benchmarks/F23.StringSimilarity.Benchmarks.csproj
@@ -2,14 +2,14 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
+      <PackageReference Include="BenchmarkDotNet" Version="0.15.4" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/test/F23.StringSimilarity.Benchmarks/Program.cs b/benchmarks/F23.StringSimilarity.Benchmarks/Program.cs
similarity index 100%
rename from test/F23.StringSimilarity.Benchmarks/Program.cs
rename to benchmarks/F23.StringSimilarity.Benchmarks/Program.cs
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
deleted file mode 100644
index 3ff68bc..0000000
--- a/src/Directory.Build.props
+++ /dev/null
@@ -1,4 +0,0 @@
-<Project>
-    <!-- include parent folder props -->
-   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-</Project>
diff --git a/src/F23.StringSimilarity/F23.StringSimilarity.csproj b/src/F23.StringSimilarity/F23.StringSimilarity.csproj
index cc7b1f3..649938b 100644
--- a/src/F23.StringSimilarity/F23.StringSimilarity.csproj
+++ b/src/F23.StringSimilarity/F23.StringSimilarity.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net8.0;net9.0;net10.0</TargetFrameworks>
     <PackageId>F23.StringSimilarity</PackageId>
     <PackageTags>string;similarity;distance;levenshtein;jaro-winkler;lcs;cosine</PackageTags>
     <Title>StringSimilarity.NET</Title>
@@ -16,10 +16,17 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <Version>7.0.0</Version>
+    <Version>8.0.0-alpha</Version>
+  </PropertyGroup>
+  <PropertyGroup Label="Assembly signing" Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+    <DefineConstants>FEATURE_SIGNED_ASSEMBLY;$(DefineConstants)</DefineConstants>
+    <AssemblyOriginatorKeyFile>$(SolutionDir)StringSimilarity.NET.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+  </ItemGroup>
+  <ItemGroup Label=".NET Standard 2.0 Dependencies" Condition="'$(TargetFramework)'=='netstandard2.0'">
     <PackageReference Include="System.Memory" Version="4.6.3" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/F23.StringSimilarity/Properties/AssemblyInfo.cs b/src/F23.StringSimilarity/Properties/AssemblyInfo.cs
index be0fd35..d21ce89 100644
--- a/src/F23.StringSimilarity/Properties/AssemblyInfo.cs
+++ b/src/F23.StringSimilarity/Properties/AssemblyInfo.cs
@@ -1,3 +1,7 @@
 using System.Runtime.CompilerServices;
 
+#if FEATURE_SIGNED_ASSEMBLY
 [assembly: InternalsVisibleTo("F23.StringSimilarity.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b9a3cf7cbdb26a91b8a50d70ec052fe9f1edd3d1989e1079d0b0c1930e2030273a82629e18c7f2932a1e7957d48ec36b2703cda7bab46f3a0684cc86637e02dac24c857a43ef9a63a6459b147d11ec43b75b181de0aa326931ae13ba31c06977b309424c730d895144feab54da5ad84a604f90b2d672406177782027c8413caa")]
+#else
+[assembly: InternalsVisibleTo("F23.StringSimilarity.Tests")]
+#endif
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
deleted file mode 100644
index 3ff68bc..0000000
--- a/test/Directory.Build.props
+++ /dev/null
@@ -1,4 +0,0 @@
-<Project>
-    <!-- include parent folder props -->
-   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-</Project>
diff --git a/test/F23.StringSimilarity.Tests/F23.StringSimilarity.Tests.csproj b/test/F23.StringSimilarity.Tests/F23.StringSimilarity.Tests.csproj
index bc23f6a..8d91a36 100644
--- a/test/F23.StringSimilarity.Tests/F23.StringSimilarity.Tests.csproj
+++ b/test/F23.StringSimilarity.Tests/F23.StringSimilarity.Tests.csproj
@@ -7,6 +7,11 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <PropertyGroup Label="Assembly signing" Condition=" '$(TargetFramework)' == 'net481' ">
+    <AssemblyOriginatorKeyFile>$(SolutionDir)StringSimilarity.NET.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+
   <ItemGroup>
     <None Remove="11328-1.txt" />
     <None Remove="71816-2.txt" />