diff --git a/src/c#/GeneralUpdate.slnx b/src/c#/GeneralUpdate.slnx
index 00e08ac0..091a7ef4 100644
--- a/src/c#/GeneralUpdate.slnx
+++ b/src/c#/GeneralUpdate.slnx
@@ -10,11 +10,11 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/src/c#/BowlTest/BowlTest.csproj b/tests/c#/BowlTest/BowlTest.csproj
similarity index 84%
rename from src/c#/BowlTest/BowlTest.csproj
rename to tests/c#/BowlTest/BowlTest.csproj
index 17970bb3..6978cd44 100644
--- a/src/c#/BowlTest/BowlTest.csproj
+++ b/tests/c#/BowlTest/BowlTest.csproj
@@ -1,4 +1,4 @@
-
+
net10.0
@@ -20,7 +20,7 @@
-
+
diff --git a/src/c#/BowlTest/BowlTests.cs b/tests/c#/BowlTest/BowlTests.cs
similarity index 100%
rename from src/c#/BowlTest/BowlTests.cs
rename to tests/c#/BowlTest/BowlTests.cs
diff --git a/src/c#/BowlTest/Integration/BowlCrashPipelineTests.cs b/tests/c#/BowlTest/Integration/BowlCrashPipelineTests.cs
similarity index 100%
rename from src/c#/BowlTest/Integration/BowlCrashPipelineTests.cs
rename to tests/c#/BowlTest/Integration/BowlCrashPipelineTests.cs
diff --git a/src/c#/BowlTest/Integration/BowlIntegrationTests.cs b/tests/c#/BowlTest/Integration/BowlIntegrationTests.cs
similarity index 100%
rename from src/c#/BowlTest/Integration/BowlIntegrationTests.cs
rename to tests/c#/BowlTest/Integration/BowlIntegrationTests.cs
diff --git a/src/c#/BowlTest/README.md b/tests/c#/BowlTest/README.md
similarity index 100%
rename from src/c#/BowlTest/README.md
rename to tests/c#/BowlTest/README.md
diff --git a/src/c#/BowlTest/Strategies/BowlAsyncTests.cs b/tests/c#/BowlTest/Strategies/BowlAsyncTests.cs
similarity index 100%
rename from src/c#/BowlTest/Strategies/BowlAsyncTests.cs
rename to tests/c#/BowlTest/Strategies/BowlAsyncTests.cs
diff --git a/src/c#/BowlTest/Strategies/BowlContextTests.cs b/tests/c#/BowlTest/Strategies/BowlContextTests.cs
similarity index 100%
rename from src/c#/BowlTest/Strategies/BowlContextTests.cs
rename to tests/c#/BowlTest/Strategies/BowlContextTests.cs
diff --git a/src/c#/BowlTest/Strategies/BowlResultTests.cs b/tests/c#/BowlTest/Strategies/BowlResultTests.cs
similarity index 100%
rename from src/c#/BowlTest/Strategies/BowlResultTests.cs
rename to tests/c#/BowlTest/Strategies/BowlResultTests.cs
diff --git a/src/c#/BowlTest/Strategys/AbstractStrategyTests.cs b/tests/c#/BowlTest/Strategys/AbstractStrategyTests.cs
similarity index 100%
rename from src/c#/BowlTest/Strategys/AbstractStrategyTests.cs
rename to tests/c#/BowlTest/Strategys/AbstractStrategyTests.cs
diff --git a/src/c#/BowlTest/Strategys/MonitorParameterTests.cs b/tests/c#/BowlTest/Strategys/MonitorParameterTests.cs
similarity index 100%
rename from src/c#/BowlTest/Strategys/MonitorParameterTests.cs
rename to tests/c#/BowlTest/Strategys/MonitorParameterTests.cs
diff --git a/src/c#/BowlTest/Strategys/WindowStrategyTests.cs b/tests/c#/BowlTest/Strategys/WindowStrategyTests.cs
similarity index 100%
rename from src/c#/BowlTest/Strategys/WindowStrategyTests.cs
rename to tests/c#/BowlTest/Strategys/WindowStrategyTests.cs
diff --git a/src/c#/ClientCoreTest/Bootstrap/GeneralClientBootstrapTests.cs b/tests/c#/ClientCoreTest/Bootstrap/GeneralClientBootstrapTests.cs
similarity index 100%
rename from src/c#/ClientCoreTest/Bootstrap/GeneralClientBootstrapTests.cs
rename to tests/c#/ClientCoreTest/Bootstrap/GeneralClientBootstrapTests.cs
diff --git a/src/c#/ClientCoreTest/ClientCoreTest.csproj b/tests/c#/ClientCoreTest/ClientCoreTest.csproj
similarity index 82%
rename from src/c#/ClientCoreTest/ClientCoreTest.csproj
rename to tests/c#/ClientCoreTest/ClientCoreTest.csproj
index f0c30874..32b8e507 100644
--- a/src/c#/ClientCoreTest/ClientCoreTest.csproj
+++ b/tests/c#/ClientCoreTest/ClientCoreTest.csproj
@@ -1,4 +1,4 @@
-
+
net10.0
@@ -20,7 +20,7 @@
-
+
\ No newline at end of file
diff --git a/src/c#/ClientCoreTest/Hubs/RandomRetryPolicyTests.cs b/tests/c#/ClientCoreTest/Hubs/RandomRetryPolicyTests.cs
similarity index 100%
rename from src/c#/ClientCoreTest/Hubs/RandomRetryPolicyTests.cs
rename to tests/c#/ClientCoreTest/Hubs/RandomRetryPolicyTests.cs
diff --git a/src/c#/ClientCoreTest/Hubs/UpgradeHubServiceTests.cs b/tests/c#/ClientCoreTest/Hubs/UpgradeHubServiceTests.cs
similarity index 100%
rename from src/c#/ClientCoreTest/Hubs/UpgradeHubServiceTests.cs
rename to tests/c#/ClientCoreTest/Hubs/UpgradeHubServiceTests.cs
diff --git a/src/c#/ClientCoreTest/OSS/GeneralClientOSSTests.cs b/tests/c#/ClientCoreTest/OSS/GeneralClientOSSTests.cs
similarity index 100%
rename from src/c#/ClientCoreTest/OSS/GeneralClientOSSTests.cs
rename to tests/c#/ClientCoreTest/OSS/GeneralClientOSSTests.cs
diff --git a/src/c#/ClientCoreTest/Pipeline/CompressMiddlewareTests.cs b/tests/c#/ClientCoreTest/Pipeline/CompressMiddlewareTests.cs
similarity index 100%
rename from src/c#/ClientCoreTest/Pipeline/CompressMiddlewareTests.cs
rename to tests/c#/ClientCoreTest/Pipeline/CompressMiddlewareTests.cs
diff --git a/src/c#/ClientCoreTest/Pipeline/HashMiddlewareTests.cs b/tests/c#/ClientCoreTest/Pipeline/HashMiddlewareTests.cs
similarity index 100%
rename from src/c#/ClientCoreTest/Pipeline/HashMiddlewareTests.cs
rename to tests/c#/ClientCoreTest/Pipeline/HashMiddlewareTests.cs
diff --git a/src/c#/ClientCoreTest/Pipeline/PatchMiddlewareTests.cs b/tests/c#/ClientCoreTest/Pipeline/PatchMiddlewareTests.cs
similarity index 100%
rename from src/c#/ClientCoreTest/Pipeline/PatchMiddlewareTests.cs
rename to tests/c#/ClientCoreTest/Pipeline/PatchMiddlewareTests.cs
diff --git a/src/c#/ClientCoreTest/README.md b/tests/c#/ClientCoreTest/README.md
similarity index 100%
rename from src/c#/ClientCoreTest/README.md
rename to tests/c#/ClientCoreTest/README.md
diff --git a/src/c#/ClientCoreTest/Strategy/LinuxStrategyTests.cs b/tests/c#/ClientCoreTest/Strategy/LinuxStrategyTests.cs
similarity index 100%
rename from src/c#/ClientCoreTest/Strategy/LinuxStrategyTests.cs
rename to tests/c#/ClientCoreTest/Strategy/LinuxStrategyTests.cs
diff --git a/src/c#/ClientCoreTest/Strategy/WindowsStrategyTests.cs b/tests/c#/ClientCoreTest/Strategy/WindowsStrategyTests.cs
similarity index 100%
rename from src/c#/ClientCoreTest/Strategy/WindowsStrategyTests.cs
rename to tests/c#/ClientCoreTest/Strategy/WindowsStrategyTests.cs
diff --git a/src/c#/CoreTest/Bootstrap/GeneralUpdateBootstrapTests.cs b/tests/c#/CoreTest/Bootstrap/GeneralUpdateBootstrapTests.cs
similarity index 100%
rename from src/c#/CoreTest/Bootstrap/GeneralUpdateBootstrapTests.cs
rename to tests/c#/CoreTest/Bootstrap/GeneralUpdateBootstrapTests.cs
diff --git a/src/c#/CoreTest/Bootstrap/GeneralUpdateOSSTests.cs b/tests/c#/CoreTest/Bootstrap/GeneralUpdateOSSTests.cs
similarity index 100%
rename from src/c#/CoreTest/Bootstrap/GeneralUpdateOSSTests.cs
rename to tests/c#/CoreTest/Bootstrap/GeneralUpdateOSSTests.cs
diff --git a/src/c#/CoreTest/CoreTest.csproj b/tests/c#/CoreTest/CoreTest.csproj
similarity index 83%
rename from src/c#/CoreTest/CoreTest.csproj
rename to tests/c#/CoreTest/CoreTest.csproj
index cef69e89..343e72a9 100644
--- a/src/c#/CoreTest/CoreTest.csproj
+++ b/tests/c#/CoreTest/CoreTest.csproj
@@ -1,4 +1,4 @@
-
+
net10.0
@@ -20,7 +20,7 @@
-
+
\ No newline at end of file
diff --git a/src/c#/CoreTest/Pipeline/CompressMiddlewareTests.cs b/tests/c#/CoreTest/Pipeline/CompressMiddlewareTests.cs
similarity index 100%
rename from src/c#/CoreTest/Pipeline/CompressMiddlewareTests.cs
rename to tests/c#/CoreTest/Pipeline/CompressMiddlewareTests.cs
diff --git a/src/c#/CoreTest/Pipeline/HashMiddlewareTests.cs b/tests/c#/CoreTest/Pipeline/HashMiddlewareTests.cs
similarity index 100%
rename from src/c#/CoreTest/Pipeline/HashMiddlewareTests.cs
rename to tests/c#/CoreTest/Pipeline/HashMiddlewareTests.cs
diff --git a/src/c#/CoreTest/Pipeline/PatchMiddlewareTests.cs b/tests/c#/CoreTest/Pipeline/PatchMiddlewareTests.cs
similarity index 100%
rename from src/c#/CoreTest/Pipeline/PatchMiddlewareTests.cs
rename to tests/c#/CoreTest/Pipeline/PatchMiddlewareTests.cs
diff --git a/src/c#/CoreTest/Shared/ConfiginfoBuilderTests.cs b/tests/c#/CoreTest/Shared/ConfiginfoBuilderTests.cs
similarity index 100%
rename from src/c#/CoreTest/Shared/ConfiginfoBuilderTests.cs
rename to tests/c#/CoreTest/Shared/ConfiginfoBuilderTests.cs
diff --git a/src/c#/CoreTest/Strategys/LinuxStrategyTests.cs b/tests/c#/CoreTest/Strategys/LinuxStrategyTests.cs
similarity index 100%
rename from src/c#/CoreTest/Strategys/LinuxStrategyTests.cs
rename to tests/c#/CoreTest/Strategys/LinuxStrategyTests.cs
diff --git a/src/c#/CoreTest/Strategys/OSSStrategyTests.cs b/tests/c#/CoreTest/Strategys/OSSStrategyTests.cs
similarity index 100%
rename from src/c#/CoreTest/Strategys/OSSStrategyTests.cs
rename to tests/c#/CoreTest/Strategys/OSSStrategyTests.cs
diff --git a/src/c#/CoreTest/Strategys/WindowsStrategyTests.cs b/tests/c#/CoreTest/Strategys/WindowsStrategyTests.cs
similarity index 100%
rename from src/c#/CoreTest/Strategys/WindowsStrategyTests.cs
rename to tests/c#/CoreTest/Strategys/WindowsStrategyTests.cs
diff --git a/src/c#/DifferentialTest/Binary/BinaryHandlerTests.cs b/tests/c#/DifferentialTest/Binary/BinaryHandlerTests.cs
similarity index 100%
rename from src/c#/DifferentialTest/Binary/BinaryHandlerTests.cs
rename to tests/c#/DifferentialTest/Binary/BinaryHandlerTests.cs
diff --git a/src/c#/DifferentialTest/Differ/StreamingHdiffDifferTests.cs b/tests/c#/DifferentialTest/Differ/StreamingHdiffDifferTests.cs
similarity index 100%
rename from src/c#/DifferentialTest/Differ/StreamingHdiffDifferTests.cs
rename to tests/c#/DifferentialTest/Differ/StreamingHdiffDifferTests.cs
diff --git a/src/c#/DifferentialTest/DifferentialCoreTests.cs b/tests/c#/DifferentialTest/DifferentialCoreTests.cs
similarity index 100%
rename from src/c#/DifferentialTest/DifferentialCoreTests.cs
rename to tests/c#/DifferentialTest/DifferentialCoreTests.cs
diff --git a/src/c#/DifferentialTest/DifferentialTest.csproj b/tests/c#/DifferentialTest/DifferentialTest.csproj
similarity index 83%
rename from src/c#/DifferentialTest/DifferentialTest.csproj
rename to tests/c#/DifferentialTest/DifferentialTest.csproj
index 1384b0e4..816120ef 100644
--- a/src/c#/DifferentialTest/DifferentialTest.csproj
+++ b/tests/c#/DifferentialTest/DifferentialTest.csproj
@@ -1,4 +1,4 @@
-
+
net10.0
@@ -21,7 +21,7 @@
-
+
diff --git a/src/c#/DifferentialTest/Matchers/MatcherTests.cs b/tests/c#/DifferentialTest/Matchers/MatcherTests.cs
similarity index 100%
rename from src/c#/DifferentialTest/Matchers/MatcherTests.cs
rename to tests/c#/DifferentialTest/Matchers/MatcherTests.cs
diff --git a/src/c#/DifferentialTest/Pipeline/DiffPipelineTests.cs b/tests/c#/DifferentialTest/Pipeline/DiffPipelineTests.cs
similarity index 100%
rename from src/c#/DifferentialTest/Pipeline/DiffPipelineTests.cs
rename to tests/c#/DifferentialTest/Pipeline/DiffPipelineTests.cs
diff --git a/src/c#/DrivelutionTest/Core/DriverUpdaterFactoryTests.cs b/tests/c#/DrivelutionTest/Core/DriverUpdaterFactoryTests.cs
similarity index 100%
rename from src/c#/DrivelutionTest/Core/DriverUpdaterFactoryTests.cs
rename to tests/c#/DrivelutionTest/Core/DriverUpdaterFactoryTests.cs
diff --git a/src/c#/DrivelutionTest/DrivelutionTest.csproj b/tests/c#/DrivelutionTest/DrivelutionTest.csproj
similarity index 87%
rename from src/c#/DrivelutionTest/DrivelutionTest.csproj
rename to tests/c#/DrivelutionTest/DrivelutionTest.csproj
index c869734a..160e9c96 100644
--- a/src/c#/DrivelutionTest/DrivelutionTest.csproj
+++ b/tests/c#/DrivelutionTest/DrivelutionTest.csproj
@@ -22,7 +22,7 @@
-
+
diff --git a/src/c#/DrivelutionTest/Execution/CommandResultTests.cs b/tests/c#/DrivelutionTest/Execution/CommandResultTests.cs
similarity index 100%
rename from src/c#/DrivelutionTest/Execution/CommandResultTests.cs
rename to tests/c#/DrivelutionTest/Execution/CommandResultTests.cs
diff --git a/src/c#/DrivelutionTest/GeneralDrivelutionTests.cs b/tests/c#/DrivelutionTest/GeneralDrivelutionTests.cs
similarity index 100%
rename from src/c#/DrivelutionTest/GeneralDrivelutionTests.cs
rename to tests/c#/DrivelutionTest/GeneralDrivelutionTests.cs
diff --git a/src/c#/DrivelutionTest/Models/ModelTests.cs b/tests/c#/DrivelutionTest/Models/ModelTests.cs
similarity index 100%
rename from src/c#/DrivelutionTest/Models/ModelTests.cs
rename to tests/c#/DrivelutionTest/Models/ModelTests.cs
diff --git a/src/c#/DrivelutionTest/Models/NewModelTests.cs b/tests/c#/DrivelutionTest/Models/NewModelTests.cs
similarity index 100%
rename from src/c#/DrivelutionTest/Models/NewModelTests.cs
rename to tests/c#/DrivelutionTest/Models/NewModelTests.cs
diff --git a/src/c#/DrivelutionTest/Pipeline/BaseDriverUpdaterTests.cs b/tests/c#/DrivelutionTest/Pipeline/BaseDriverUpdaterTests.cs
similarity index 100%
rename from src/c#/DrivelutionTest/Pipeline/BaseDriverUpdaterTests.cs
rename to tests/c#/DrivelutionTest/Pipeline/BaseDriverUpdaterTests.cs
diff --git a/src/c#/DrivelutionTest/Pipeline/PipelineContextTests.cs b/tests/c#/DrivelutionTest/Pipeline/PipelineContextTests.cs
similarity index 100%
rename from src/c#/DrivelutionTest/Pipeline/PipelineContextTests.cs
rename to tests/c#/DrivelutionTest/Pipeline/PipelineContextTests.cs
diff --git a/src/c#/DrivelutionTest/Pipeline/PipelineResultTests.cs b/tests/c#/DrivelutionTest/Pipeline/PipelineResultTests.cs
similarity index 100%
rename from src/c#/DrivelutionTest/Pipeline/PipelineResultTests.cs
rename to tests/c#/DrivelutionTest/Pipeline/PipelineResultTests.cs
diff --git a/src/c#/DrivelutionTest/Pipeline/RetryPolicyTests.cs b/tests/c#/DrivelutionTest/Pipeline/RetryPolicyTests.cs
similarity index 100%
rename from src/c#/DrivelutionTest/Pipeline/RetryPolicyTests.cs
rename to tests/c#/DrivelutionTest/Pipeline/RetryPolicyTests.cs
diff --git a/src/c#/DrivelutionTest/Utilities/CompatibilityCheckerTests.cs b/tests/c#/DrivelutionTest/Utilities/CompatibilityCheckerTests.cs
similarity index 100%
rename from src/c#/DrivelutionTest/Utilities/CompatibilityCheckerTests.cs
rename to tests/c#/DrivelutionTest/Utilities/CompatibilityCheckerTests.cs
diff --git a/src/c#/DrivelutionTest/Utilities/HashValidatorTests.cs b/tests/c#/DrivelutionTest/Utilities/HashValidatorTests.cs
similarity index 100%
rename from src/c#/DrivelutionTest/Utilities/HashValidatorTests.cs
rename to tests/c#/DrivelutionTest/Utilities/HashValidatorTests.cs
diff --git a/src/c#/DrivelutionTest/Utilities/VersionComparerAndRestartHelperTests.cs b/tests/c#/DrivelutionTest/Utilities/VersionComparerAndRestartHelperTests.cs
similarity index 100%
rename from src/c#/DrivelutionTest/Utilities/VersionComparerAndRestartHelperTests.cs
rename to tests/c#/DrivelutionTest/Utilities/VersionComparerAndRestartHelperTests.cs
diff --git a/src/c#/ExtensionTest/DependencyResolverTests.cs b/tests/c#/ExtensionTest/DependencyResolverTests.cs
similarity index 100%
rename from src/c#/ExtensionTest/DependencyResolverTests.cs
rename to tests/c#/ExtensionTest/DependencyResolverTests.cs
diff --git a/src/c#/ExtensionTest/DownloadQueueManagerTests.cs b/tests/c#/ExtensionTest/DownloadQueueManagerTests.cs
similarity index 100%
rename from src/c#/ExtensionTest/DownloadQueueManagerTests.cs
rename to tests/c#/ExtensionTest/DownloadQueueManagerTests.cs
diff --git a/src/c#/ExtensionTest/ExtensionCatalogTests.cs b/tests/c#/ExtensionTest/ExtensionCatalogTests.cs
similarity index 100%
rename from src/c#/ExtensionTest/ExtensionCatalogTests.cs
rename to tests/c#/ExtensionTest/ExtensionCatalogTests.cs
diff --git a/src/c#/ExtensionTest/ExtensionTest.csproj b/tests/c#/ExtensionTest/ExtensionTest.csproj
similarity index 83%
rename from src/c#/ExtensionTest/ExtensionTest.csproj
rename to tests/c#/ExtensionTest/ExtensionTest.csproj
index b75080c1..7b1720c5 100644
--- a/src/c#/ExtensionTest/ExtensionTest.csproj
+++ b/tests/c#/ExtensionTest/ExtensionTest.csproj
@@ -1,4 +1,4 @@
-
+
net10.0
@@ -20,7 +20,7 @@
-
+
\ No newline at end of file
diff --git a/src/c#/ExtensionTest/GeneralExtensionHostTests.cs b/tests/c#/ExtensionTest/GeneralExtensionHostTests.cs
similarity index 100%
rename from src/c#/ExtensionTest/GeneralExtensionHostTests.cs
rename to tests/c#/ExtensionTest/GeneralExtensionHostTests.cs
diff --git a/src/c#/ExtensionTest/PlatformMatcherTests.cs b/tests/c#/ExtensionTest/PlatformMatcherTests.cs
similarity index 100%
rename from src/c#/ExtensionTest/PlatformMatcherTests.cs
rename to tests/c#/ExtensionTest/PlatformMatcherTests.cs
diff --git a/src/c#/ExtensionTest/VersionCompatibilityCheckerTests.cs b/tests/c#/ExtensionTest/VersionCompatibilityCheckerTests.cs
similarity index 100%
rename from src/c#/ExtensionTest/VersionCompatibilityCheckerTests.cs
rename to tests/c#/ExtensionTest/VersionCompatibilityCheckerTests.cs