diff --git a/MessagePack.sln b/MessagePack.sln
index c2894f9c..6157da34 100644
--- a/MessagePack.sln
+++ b/MessagePack.sln
@@ -82,11 +82,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MessagePackAnalyzer.Tests",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MessagePack.Generator.Tests", "tests\MessagePack.Generator.Tests\MessagePack.Generator.Tests.csproj", "{6AC51E68-4681-463A-B4B6-BD53517244B2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HardwareIntrinsicsBenchmark", "benchmark\HardwareIntrinsicsBenchmark\HardwareIntrinsicsBenchmark.csproj", "{4C9BB260-62D8-49CD-9F9C-9AA6A8BFC637}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExperimentalBenchmark", "benchmark\ExperimentalBenchmark\ExperimentalBenchmark.csproj", "{4C9BB260-62D8-49CD-9F9C-9AA6A8BFC637}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MessagePack.Experimental", "src\MessagePack.Experimental\MessagePack.Experimental.csproj", "{AC2503A7-736D-4AE6-9355-CF35D9DF6139}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MessagePack.Experimental.Tests", "tests\MessagePack.Experimental.Tests\MessagePack.Experimental.Tests.csproj", "{8AB40D1C-1134-4D77-B39A-19AEDC729450}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MessagePack.Experimental.Tests", "tests\MessagePack.Experimental.Tests\MessagePack.Experimental.Tests.csproj", "{8AB40D1C-1134-4D77-B39A-19AEDC729450}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/benchmark/HardwareIntrinsicsBenchmark/HardwareIntrinsicsBenchmark.csproj b/benchmark/ExperimentalBenchmark/ExperimentalBenchmark.csproj
similarity index 91%
rename from benchmark/HardwareIntrinsicsBenchmark/HardwareIntrinsicsBenchmark.csproj
rename to benchmark/ExperimentalBenchmark/ExperimentalBenchmark.csproj
index 7cee2e56..5b508683 100644
--- a/benchmark/HardwareIntrinsicsBenchmark/HardwareIntrinsicsBenchmark.csproj
+++ b/benchmark/ExperimentalBenchmark/ExperimentalBenchmark.csproj
@@ -3,9 +3,10 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <AssemblyName>HardwareIntrinsicsBenchmark</AssemblyName>
+    <AssemblyName>ExperimentalBenchmark</AssemblyName>
     <RootNamespace>Benchmark</RootNamespace>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/benchmark/HardwareIntrinsicsBenchmark/MessagePack_2_1_165.dll b/benchmark/ExperimentalBenchmark/MessagePack_2_1_165.dll
similarity index 100%
rename from benchmark/HardwareIntrinsicsBenchmark/MessagePack_2_1_165.dll
rename to benchmark/ExperimentalBenchmark/MessagePack_2_1_165.dll
diff --git a/benchmark/HardwareIntrinsicsBenchmark/Program.cs b/benchmark/ExperimentalBenchmark/Program.cs
similarity index 100%
rename from benchmark/HardwareIntrinsicsBenchmark/Program.cs
rename to benchmark/ExperimentalBenchmark/Program.cs
diff --git a/benchmark/HardwareIntrinsicsBenchmark/Tests.cs b/benchmark/ExperimentalBenchmark/Tests.cs
similarity index 98%
rename from benchmark/HardwareIntrinsicsBenchmark/Tests.cs
rename to benchmark/ExperimentalBenchmark/Tests.cs
index 483bcd35..ffbfe7d6 100644
--- a/benchmark/HardwareIntrinsicsBenchmark/Tests.cs
+++ b/benchmark/ExperimentalBenchmark/Tests.cs
@@ -69,7 +69,7 @@ namespace Benchmark
         [GlobalSetup]
         public void SetUp()
         {
-            var resolver = newmsgpack::MessagePack.Resolvers.CompositeResolver.Create(new newmsgpack::MessagePack.Formatters.IMessagePackFormatter[] { new newmsgpack.MessagePack.Formatters.UnsafeUnmanagedStructArrayFormatter<Matrix4x4>(50) }, new[] { newmsgpack::MessagePack.Resolvers.StandardResolver.Instance });
+            var resolver = newmsgpack::MessagePack.Resolvers.CompositeResolver.Create(new newmsgpack::MessagePack.Formatters.IMessagePackFormatter[] { new newmsgpack::MessagePack.Formatters.UnsafeUnmanagedStructArrayFormatter<Matrix4x4>(50) }, new[] { newmsgpack::MessagePack.Resolvers.StandardResolver.Instance });
             options = newmsgpack::MessagePack.MessagePackSerializerOptions.Standard.WithResolver(resolver);
 
             input = new Matrix4x4[Size];
diff --git a/src/MessagePack.Experimental/FormatterHelpers.cs b/src/MessagePack.Experimental/HardwareIntrinsics/FormatterHelpers.cs
similarity index 100%
rename from src/MessagePack.Experimental/FormatterHelpers.cs
rename to src/MessagePack.Experimental/HardwareIntrinsics/FormatterHelpers.cs
diff --git a/src/MessagePack.Experimental/FormatterHelpers.tt b/src/MessagePack.Experimental/HardwareIntrinsics/FormatterHelpers.tt
similarity index 100%
rename from src/MessagePack.Experimental/FormatterHelpers.tt
rename to src/MessagePack.Experimental/HardwareIntrinsics/FormatterHelpers.tt
diff --git a/src/MessagePack.Experimental/Formatters.cs b/src/MessagePack.Experimental/HardwareIntrinsics/Formatters.cs
similarity index 100%
rename from src/MessagePack.Experimental/Formatters.cs
rename to src/MessagePack.Experimental/HardwareIntrinsics/Formatters.cs
diff --git a/src/MessagePack.Experimental/PrimitiveArrayGetFormatterHelper.cs b/src/MessagePack.Experimental/HardwareIntrinsics/PrimitiveArrayGetFormatterHelper.cs
similarity index 100%
rename from src/MessagePack.Experimental/PrimitiveArrayGetFormatterHelper.cs
rename to src/MessagePack.Experimental/HardwareIntrinsics/PrimitiveArrayGetFormatterHelper.cs
diff --git a/src/MessagePack.Experimental/PrimitiveArrayGetFormatterHelper.tt b/src/MessagePack.Experimental/HardwareIntrinsics/PrimitiveArrayGetFormatterHelper.tt
similarity index 100%
rename from src/MessagePack.Experimental/PrimitiveArrayGetFormatterHelper.tt
rename to src/MessagePack.Experimental/HardwareIntrinsics/PrimitiveArrayGetFormatterHelper.tt
diff --git a/src/MessagePack.Experimental/PrimitiveArrayResolver.cs b/src/MessagePack.Experimental/HardwareIntrinsics/PrimitiveArrayResolver.cs
similarity index 100%
rename from src/MessagePack.Experimental/PrimitiveArrayResolver.cs
rename to src/MessagePack.Experimental/HardwareIntrinsics/PrimitiveArrayResolver.cs
diff --git a/src/MessagePack.Experimental/UnsafeMemoryAlignmentUtility.cs b/src/MessagePack.Experimental/HardwareIntrinsics/UnsafeMemoryAlignmentUtility.cs
similarity index 100%
rename from src/MessagePack.Experimental/UnsafeMemoryAlignmentUtility.cs
rename to src/MessagePack.Experimental/HardwareIntrinsics/UnsafeMemoryAlignmentUtility.cs
diff --git a/src/MessagePack.Experimental/MessagePack.Experimental.csproj b/src/MessagePack.Experimental/MessagePack.Experimental.csproj
index 401dd343..5053878d 100644
--- a/src/MessagePack.Experimental/MessagePack.Experimental.csproj
+++ b/src/MessagePack.Experimental/MessagePack.Experimental.csproj
@@ -5,6 +5,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>8.0</LangVersion>
     <Nullable>enable</Nullable>
+    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
 
     <IsPackable>true</IsPackable>
     <Title>MessagePack for C#, Experimental Plugins</Title>
@@ -13,23 +14,23 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Update="FormatterHelpers.tt">
+    <None Update="HardwareIntrinsics\FormatterHelpers.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>FormatterHelpers.cs</LastGenOutput>
     </None>
-    <None Update="PrimitiveArrayGetFormatterHelper.tt">
+    <None Update="HardwareIntrinsics\PrimitiveArrayGetFormatterHelper.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>PrimitiveArrayGetFormatterHelper.cs</LastGenOutput>
     </None>
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="FormatterHelpers.cs">
+    <Compile Update="HardwareIntrinsics\FormatterHelpers.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
       <DependentUpon>FormatterHelpers.tt</DependentUpon>
     </Compile>
-    <Compile Update="PrimitiveArrayGetFormatterHelper.cs">
+    <Compile Update="HardwareIntrinsics\PrimitiveArrayGetFormatterHelper.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
       <DependentUpon>PrimitiveArrayGetFormatterHelper.tt</DependentUpon>