diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 11213c83..e4d8739a 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -1,4 +1,4 @@
 jobs:
-  - template: .ci/azure-pipelines-linux.yml
-  - template: .ci/azure-pipelines-win.yml
-  - template: .ci/azure-pipelines-macos.yml
+  - template: .ci/azure-pipelines/linux.yml
+  - template: .ci/azure-pipelines/windows.yml
+  - template: .ci/azure-pipelines/macos.yml
diff --git a/.ci/azure-pipelines-linux.yml b/.ci/azure-pipelines/linux.yml
similarity index 100%
rename from .ci/azure-pipelines-linux.yml
rename to .ci/azure-pipelines/linux.yml
diff --git a/.ci/azure-pipelines-macos.yml b/.ci/azure-pipelines/macos.yml
similarity index 100%
rename from .ci/azure-pipelines-macos.yml
rename to .ci/azure-pipelines/macos.yml
diff --git a/.ci/azure-pipelines-win-steps.yml b/.ci/azure-pipelines/windows-steps.yml
similarity index 100%
rename from .ci/azure-pipelines-win-steps.yml
rename to .ci/azure-pipelines/windows-steps.yml
diff --git a/.ci/azure-pipelines-win.yml b/.ci/azure-pipelines/windows.yml
similarity index 90%
rename from .ci/azure-pipelines-win.yml
rename to .ci/azure-pipelines/windows.yml
index 5a63ab08..f8cff95f 100644
--- a/.ci/azure-pipelines-win.yml
+++ b/.ci/azure-pipelines/windows.yml
@@ -4,7 +4,7 @@ jobs:
   pool:
     vmImage: windows-latest
   steps:
-  - template: "azure-pipelines-win-steps.yml"
+  - template: "windows-steps.yml"
     parameters:
       architecture: "x86_64"
       compilerPath: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/Llvm/x64/bin/clang-cl.exe"
@@ -15,7 +15,7 @@ jobs:
   pool:
     vmImage: windows-latest
   steps:
-  - template: "azure-pipelines-win-steps.yml"
+  - template: "windows-steps.yml"
     parameters:
       architecture: "x86"
       compilerPath: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/Llvm/bin/clang-cl.exe"