diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7912a59fb..ba0489d1c 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -382,9 +382,9 @@ stages:
       condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
       strategy:
         matrix:
-          mono510:
-            testName: 'Mono 5.10'
-            containerImage: servarr/testimages:mono-5.10
+          mono508:
+            testName: 'Mono 5.8'
+            containerImage: servarr/testimages:mono-5.8
           mono520:
             testName: 'Mono 5.20'
             containerImage: servarr/testimages:mono-5.20
@@ -525,9 +525,9 @@ stages:
       condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
       strategy:
         matrix:
-          mono510:
-            testName: 'Mono 5.10'
-            containerImage: servarr/testimages:mono-5.10
+          mono508:
+            testName: 'Mono 5.8'
+            containerImage: servarr/testimages:mono-5.8
           mono520:
             testName: 'Mono 5.20'
             containerImage: servarr/testimages:mono-5.20
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 55b9da833..71ec08d0d 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -4,6 +4,7 @@
     <DebugType>full</DebugType>
   </PropertyGroup>
 
-  <Import Project="PublishAllRids.targets" />
-  <Import Project="MonoFacades.targets" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' and !$(RuntimeIdentifier.StartsWith('win'))" />
+  <Import Project="Targets/PublishAllRids.targets" />
+  <Import Project="Targets/FixBindingRedirects.targets" />
+  <Import Project="Targets/MonoFacades.targets" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' and !$(RuntimeIdentifier.StartsWith('win'))" />
 </Project>
diff --git a/src/FixBindingRedirects.targets b/src/Targets/FixBindingRedirects.targets
similarity index 100%
rename from src/FixBindingRedirects.targets
rename to src/Targets/FixBindingRedirects.targets
diff --git a/src/MonoFacades.targets b/src/Targets/MonoFacades.targets
similarity index 100%
rename from src/MonoFacades.targets
rename to src/Targets/MonoFacades.targets
diff --git a/src/PublishAllRids.targets b/src/Targets/PublishAllRids.targets
similarity index 100%
rename from src/PublishAllRids.targets
rename to src/Targets/PublishAllRids.targets