diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 45e84949..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,97 +0,0 @@
-language: cpp
-sudo: required
-
-cache:
-  directories:
-    - ${TRAVIS_BUILD_DIR}/deps
-
-services:
-  - docker
-
-env:
-  global:
-    secure: "PUXsXOrIGEZMK78hPI2do7FRLr1qB/jS/cXPOgVEHT/iJYU9hzu5BkJHjRLKZ7uM6L+17FM3OVJFsWk68Rcql7pT79G1nI6l0RyqsazMdgDDed2FlxxmvRmHuRT6ONqvBEDSItkIn16Y2ld+UukG36bLSVYyuc5NaMBV/cB8kyBgq41rf+jBvrGvsBV5aN73ZWqMwCqNsRLhwGRqhJlGcPsAc0j957O3fzEeTRF9SMVczpMt8fGFD/2R2gyyX50zX2YTRAT9d7kyl/IFi9GtIYQs/afIQ1hYDzWK+bYpHozoiSYHfs8YBYdtFItj2P3h2XsZgG9t4FlLInF7phCTftRTTB+G6eT0N8mOPi+uCXR1m9lU7TF5rKhL7Yg+KTQiHFfDxHzPrzmKht06b7lCuMfY7nBgmJXEZOtDFuhPdxubu3TD4DRtn36NyW1PPMOBI/guii1ywrlWl0HeKciaRlPHbP0RB+s0eBWWzVpiJVveO1sO0MgtZ4/+v+REtqNAsD26iLGgvrahMMdw/dWTt3Niez93xrUSYVA9mnk/Dlc42y02+Okwu+Jw0GPnBCMq7snfYwZMFM2EN4waCaxbgPSNOvuLIfmLTWnpjMcVh2FtfP39jlBPymO9FYZyqlfZBc6mzFOEB9pVN1rMKPqk9cYFvcvY1sP10owVwFSWpIo="
-
-matrix:
-  include:
-    - os: linux
-      dist: focal
-      python: 3.6
-      env:
-        - PYTHON=python PIP=pip
-    - os: linux
-      dist: bionic
-      python: 3.6
-      env:
-        - PYTHON=python PIP=pip
-    - os: linux
-      dist: xenial
-      python: 3.6
-      env:
-        - PYTHON=python PIP=pip
-    - os: linux
-      dist: bionic
-      env:
-        - OS_TYPE=doxygen
-      addons: { apt: { packages: ["cmake", "graphviz"] } }
-    - compiler: "gcc"
-      os: osx
-      osx_image: xcode10.1
-      env:
-        - EXTRA_SSH=-oHostKeyAlgorithms=+ssh-dss
-    - compiler: "gcc"
-      os: osx
-      osx_image: xcode11
-      env:
-        - EXTRA_SSH=-oHostKeyAlgorithms=+ssh-dss
-    - compiler: "gcc"
-      os: osx
-      osx_image: xcode12
-      env:
-        - EXTRA_SSH=-oHostKeyAlgorithms=+ssh-dss
-
-before_install:
-
-  - export DEPS_DIR="${TRAVIS_BUILD_DIR}/deps"
-  - mkdir -p ${DEPS_DIR}
-
-  # Configure git user for Travis to push documentation
-  - git config --global user.name "Travis Bot"
-  - git config --global user.email "<>"
-
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./CI/travis/before_install_darwin ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./CI/travis/before_install_linux "$OS_TYPE" "$OS_VERSION" ; fi
-
-  - mkdir -p $TRAVIS_BUILD_DIR/build
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir -p $TRAVIS_BUILD_DIR/build_tar ; fi
-
-script:
-  - if [[ -z "$ARCH" && "$TRAVIS_OS_NAME" == "linux" ]]; then ${TRAVIS_BUILD_DIR}/CI/travis/make_linux libm2k "$OS_TYPE" "$OS_VERSION" ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ${TRAVIS_BUILD_DIR}/CI/travis/make_darwin; fi
-before_deploy:
-  - ". ${TRAVIS_BUILD_DIR}/CI/travis/before_deploy"
-
-deploy:
-  - provider: releases
-    api_key:
-      secure: SwUgor/ddmI5JMdgjyaQGSp0fxCxHsHAFgq223rSByrn5yCSXarv8O43iQPWSN+1yRlykP/AIsmnVoXroMeOTW8natz4p0DvMO+HF1yrCZCL9kc3zqQOgnNTEAW3KZPFh57+m2F6qsPI57rLyT084oMSNQS3CG2dbYxmnwvZfk+wYU0afvNGFjXqsrBk5/nAcrQzCEKMgQ6ppS6FX1Er7WRsQh29JjClUp3vfbDjAKud/0m5OOIc08BfCWAETwBIX+mYkbX6Dm900c0HcbcCqrZm78Z+9SbnsHKB3f7vKhNa44EbsJ5r7oLvaXhxQsc6eYvF7yVwDINrbfSkUEfyexbVC1gZari5SozNDfuagUtuYwvvNkDNQOoIKSzkq78p4Zr9SJAMvdWnt4n7vIyl4WSod8sFvQkQAJtbt6YqR3IsWrNBwQ30krEA/jpZHoVAGH1kU31Yh4ql86S9lwgmHkdg5byWh6BOJgiBi6bwjHrATn/erPArEMBRtaqKJosPnhyd4mnStAL8fraMvejhwZEMziiDNzgClv7BC4gFJA07ncOIpgePNecdjvGxm4jmr9sK3s8Kumhn37afclqTf2TWCUbSZCkPztR0bB/QcEo0QaJn34+gx8YYziB5WQp9j+CH1D9mscYyA4vwgcpDZebIMg0NMguaCdEjqmP4pU8=
-    file:
-      - "${RELEASE_PKG_FILE_DEB}"
-      - "${RELEASE_PY_FILE_DEB}"
-      - "${RELEASE_PKG_FILE_TGZ}"
-    skip_cleanup: true
-    on:
-      repo: analogdevicesinc/libm2k
-      tags: true
-      condition: "($TRAVIS_OS_NAME = linux) && ($OS_TYPE != doxygen)"
-  - provider: releases
-    api_key:
-      secure: SwUgor/ddmI5JMdgjyaQGSp0fxCxHsHAFgq223rSByrn5yCSXarv8O43iQPWSN+1yRlykP/AIsmnVoXroMeOTW8natz4p0DvMO+HF1yrCZCL9kc3zqQOgnNTEAW3KZPFh57+m2F6qsPI57rLyT084oMSNQS3CG2dbYxmnwvZfk+wYU0afvNGFjXqsrBk5/nAcrQzCEKMgQ6ppS6FX1Er7WRsQh29JjClUp3vfbDjAKud/0m5OOIc08BfCWAETwBIX+mYkbX6Dm900c0HcbcCqrZm78Z+9SbnsHKB3f7vKhNa44EbsJ5r7oLvaXhxQsc6eYvF7yVwDINrbfSkUEfyexbVC1gZari5SozNDfuagUtuYwvvNkDNQOoIKSzkq78p4Zr9SJAMvdWnt4n7vIyl4WSod8sFvQkQAJtbt6YqR3IsWrNBwQ30krEA/jpZHoVAGH1kU31Yh4ql86S9lwgmHkdg5byWh6BOJgiBi6bwjHrATn/erPArEMBRtaqKJosPnhyd4mnStAL8fraMvejhwZEMziiDNzgClv7BC4gFJA07ncOIpgePNecdjvGxm4jmr9sK3s8Kumhn37afclqTf2TWCUbSZCkPztR0bB/QcEo0QaJn34+gx8YYziB5WQp9j+CH1D9mscYyA4vwgcpDZebIMg0NMguaCdEjqmP4pU8=
-    file:
-      - "${RELEASE_PKG_FILE_PKG}"
-      - "${RELEASE_PKG_FILE_TGZ}"
-    skip_cleanup: true
-    on:
-      repo: analogdevicesinc/libm2k
-      tags: true
-      condition: "$TRAVIS_OS_NAME = osx"
diff --git a/appveyor.yml b/CI/LEGACY/appveyor.yml
similarity index 100%
rename from appveyor.yml
rename to CI/LEGACY/appveyor.yml
diff --git a/CI/appveyor/build_appveyor_msvc.sh b/CI/LEGACY/appveyor/build_appveyor_msvc.sh
similarity index 100%
rename from CI/appveyor/build_appveyor_msvc.sh
rename to CI/LEGACY/appveyor/build_appveyor_msvc.sh
diff --git a/CI/appveyor/install_deps_msvc.sh b/CI/LEGACY/appveyor/install_deps_msvc.sh
similarity index 100%
rename from CI/appveyor/install_deps_msvc.sh
rename to CI/LEGACY/appveyor/install_deps_msvc.sh
diff --git a/CI/appveyor/install_glog.bat b/CI/LEGACY/appveyor/install_glog.bat
similarity index 100%
rename from CI/appveyor/install_glog.bat
rename to CI/LEGACY/appveyor/install_glog.bat
diff --git a/CI/travis/after_deploy b/CI/LEGACY/travis/after_deploy
similarity index 100%
rename from CI/travis/after_deploy
rename to CI/LEGACY/travis/after_deploy
diff --git a/CI/travis/before_deploy b/CI/LEGACY/travis/before_deploy
similarity index 100%
rename from CI/travis/before_deploy
rename to CI/LEGACY/travis/before_deploy
diff --git a/CI/travis/before_install_darwin b/CI/LEGACY/travis/before_install_darwin
similarity index 100%
rename from CI/travis/before_install_darwin
rename to CI/LEGACY/travis/before_install_darwin
diff --git a/CI/travis/before_install_linux b/CI/LEGACY/travis/before_install_linux
similarity index 100%
rename from CI/travis/before_install_linux
rename to CI/LEGACY/travis/before_install_linux
diff --git a/CI/travis/deploy b/CI/LEGACY/travis/deploy
similarity index 100%
rename from CI/travis/deploy
rename to CI/LEGACY/travis/deploy
diff --git a/CI/travis/doxygen.sh b/CI/LEGACY/travis/doxygen.sh
similarity index 100%
rename from CI/travis/doxygen.sh
rename to CI/LEGACY/travis/doxygen.sh
diff --git a/CI/travis/lib.sh b/CI/LEGACY/travis/lib.sh
similarity index 100%
rename from CI/travis/lib.sh
rename to CI/LEGACY/travis/lib.sh
diff --git a/CI/travis/make_darwin b/CI/LEGACY/travis/make_darwin
similarity index 100%
rename from CI/travis/make_darwin
rename to CI/LEGACY/travis/make_darwin
diff --git a/CI/travis/make_linux b/CI/LEGACY/travis/make_linux
similarity index 100%
rename from CI/travis/make_linux
rename to CI/LEGACY/travis/make_linux
diff --git a/CI/windows/create_zips.ps1 b/CI/windows/create_zips.ps1
index 90c1829d..f5e2fe26 100644
--- a/CI/windows/create_zips.ps1
+++ b/CI/windows/create_zips.ps1
@@ -7,11 +7,11 @@ $PLATFORM = $Env:PLATFORM
 
 $SRC_DIR = Get-Item -Path $env:BUILD_SOURCESDIRECTORY # path to repo
 $OUTSIDE_BUILD = $SRC_DIR.Parent.FullName
-$BUILD_DIR = Join-Path $OUTSIDE_BUILD "libm2k-$PLATFORM\*"
+$BUILD_DIR = Join-Path $OUTSIDE_BUILD "libm2k-$PLATFORM"
 
 
 $ARTIFACTS_DIR = Get-Item -Path $env:BUILD_ARTIFACTSTAGINGDIRECTORY # path to repo
 New-Item -Path (Join-Path $ARTIFACTS_DIR "libm2k-$PLATFORM") -ItemType Directory
-Copy-Item -Path $BUILD_DIR -Destination (Join-Path $ARTIFACTS_DIR "libm2k-$PLATFORM")
+Copy-Item -Path $BUILD_DIR -Destination (Join-Path $ARTIFACTS_DIR "libm2k-$PLATFORM") -Recurse -Container
 
 Set-Location $SRC_DIR
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 9a7109ec..32290b76 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -33,215 +33,216 @@ parameters:
     - 3.7
 
 jobs:
-# - job: LinuxBuilds
-#   strategy:
-#     matrix:
-#       ubuntu_20_04:
-#         imageName: 'ubuntu-20.04'
-#         OS_TYPE: 'ubuntu_docker'
-#         OS_VERSION: focal
-#         artifactName: 'Linux-Ubuntu-20.04'
-#         PACKAGE_TO_INSTALL: 'build/*.deb'
-#       ubuntu_22_04:
-#         imageName: 'ubuntu-22.04'
-#         OS_TYPE: 'ubuntu_docker'
-#         OS_VERSION: jammy
-#         artifactName: 'Linux-Ubuntu-22.04'
-#         PACKAGE_TO_INSTALL: 'build/*.deb'
-#       deploy_doxygen:
-#         imageName: 'ubuntu-20.04'
-#         OS_TYPE: 'doxygen'
-#         OS_VERSION: focal
-#         artifactName: 'Linux-Ubuntu-20.04'
-#         PACKAGE_TO_INSTALL: 'build/*.deb'
-#   pool:
-#     vmImage: $(imageName)
-#   steps:
-#   - checkout: self
-#     fetchDepth: 1
-#     clean: true
-#     persistCredentials: true
-#   - script: ./CI/ubuntu/install_deps
-#     displayName: "Install Dependencies"
-#   - script: ./CI/ubuntu/make_linux
-#     displayName: "Build"
-#   - task: CopyFiles@2
-#     condition: ne(variables['System.JobName'], 'deploy_doxygen')
-#     inputs:
-#       sourceFolder: '$(Agent.BuildDirectory)/s/build/'
-#       contents: '$(Agent.BuildDirectory)/s/build/?(*.deb|*.rpm)'
-#       targetFolder: '$(Build.ArtifactStagingDirectory)'
-#   - task: PublishPipelineArtifact@1
-#     condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'), ne(variables['System.JobName'], 'deploy_doxygen'))
-#     inputs:
-#       targetPath: '$(Build.ArtifactStagingDirectory)'
-#       artifactName: '$(artifactName)'
+- job: LinuxBuilds
+  strategy:
+    matrix:
+      ubuntu_20_04:
+        imageName: 'ubuntu-20.04'
+        OS_TYPE: 'ubuntu_docker'
+        OS_VERSION: focal
+        artifactName: 'Linux-Ubuntu-20.04'
+        PACKAGE_TO_INSTALL: 'build/*.deb'
+      ubuntu_22_04:
+        imageName: 'ubuntu-22.04'
+        OS_TYPE: 'ubuntu_docker'
+        OS_VERSION: jammy
+        artifactName: 'Linux-Ubuntu-22.04'
+        PACKAGE_TO_INSTALL: 'build/*.deb'
+      deploy_doxygen:
+        imageName: 'ubuntu-20.04'
+        OS_TYPE: 'doxygen'
+        OS_VERSION: focal
+        artifactName: 'Linux-Ubuntu-20.04'
+        PACKAGE_TO_INSTALL: 'build/*.deb'
+  pool:
+    vmImage: $(imageName)
+  steps:
+  - checkout: self
+    fetchDepth: 1
+    clean: true
+    persistCredentials: true
+  - script: ./CI/ubuntu/install_deps
+    displayName: "Install Dependencies"
+  - script: ./CI/ubuntu/make_linux
+    displayName: "Build"
+  - task: CopyFiles@2
+    condition: ne(variables['System.JobName'], 'deploy_doxygen')
+    inputs:
+      sourceFolder: '$(Agent.BuildDirectory)/s/build/'
+      contents: '$(Agent.BuildDirectory)/s/build/?(*.deb|*.rpm)'
+      targetFolder: '$(Build.ArtifactStagingDirectory)'
+  - task: PublishPipelineArtifact@1
+    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'), ne(variables['System.JobName'], 'deploy_doxygen'))
+    inputs:
+      targetPath: '$(Build.ArtifactStagingDirectory)'
+      artifactName: '$(artifactName)'
 
-# - job: macOSBuilds
-#   workspace:
-#     clean: all
-#   strategy:
-#     matrix:
-#       macOS_11:
-#         poolName: 'Azure Pipelines'
-#         vmImage: 'macOS-11'
-#         agentName: 'Azure Pipelines 4'
-#         artifactName: 'macOS-11'
-#       macOS_12:
-#         poolName: 'Azure Pipelines'
-#         vmImage: 'macOS-12'
-#         agentName: 'Azure Pipelines 3'
-#         artifactName: 'macOS-12'
-#       macOS_13_x64:
-#         poolName: 'Azure Pipelines'
-#         vmImage: 'macOS-13'
-#         agentName: 'Azure Pipelines 2'
-#         artifactName: 'macOS-13-x64'
-#       # TODO: discuss with DevOps team how to setup ARM agent
-#       # macOS_13_arm64:
-#       #   poolName: 'Default'
-#       #   vmImage:
-#       #   agentName: 'macOS_arm64'
-#       #   artifactName: 'macOS-13-arm64'
-#   pool:
-#     name: $(poolName)
-#     vmImage: $(vmImage)
-#     demands:
-#       - agent.name -equals $(agentName)
-#   variables:
-#     PACKAGE_TO_INSTALL: 'build/*.pkg'
-#   steps:
-#   - checkout: self
-#     fetchDepth: 1
-#     clean: true
-#   - script: ./CI/macOS/install_deps
-#     displayName: "Install Dependencies"
-#     condition: ne(variables['agentName'],'macOS_arm64')
-#   - script: ./CI/macOS/make_macOS
-#     displayName: "Build"
-#   - ${{ each pyVersion in parameters.pythonVersions }}:
-#     - task: UsePythonVersion@0
-#       displayName: Use Python ${{ pyVersion }}
-#       inputs:
-#         versionSpec: '${{ pyVersion }}'
-#     - script: |
-#             python3 --version
-#             python3 -m pip install wheel twine build virtualenv
-#             cd '$(Agent.BuildDirectory)/s/build/'
-#             mkdir -p wheelhouse
-#             export COMPILE_BINDINGS=True
-#             python3 -m build
-#             export COMPILE_BINDINGS=
-#             cp dist/*.whl wheelhouse
-#       displayName: Wheel Python ${{ pyVersion }}
-#   - task: CopyFiles@2
-#     inputs:
-#       sourceFolder: '$(Agent.BuildDirectory)/s/build/'
-#       contents: '$(Agent.BuildDirectory)/s/build/?(*.pkg)'
-#       targetFolder: '$(Build.ArtifactStagingDirectory)'
-#   - task: CopyFiles@2
-#     inputs:
-#       sourceFolder: '$(Agent.BuildDirectory)/s/build/'
-#       contents: '$(Agent.BuildDirectory)/s/build/wheelhouse/?(*.whl)'
-#       targetFolder: '$(Build.ArtifactStagingDirectory)'
-#   - task: CopyFiles@2
-#     inputs:
-#       sourceFolder: '$(Agent.BuildDirectory)/s/build_tar/'
-#       contents: '$(Agent.BuildDirectory)/s/build_tar/?(*.tar.gz)'
-#       targetFolder: '$(Build.ArtifactStagingDirectory)'
-#   - task: PublishPipelineArtifact@1
-#     condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
-#     inputs:
-#       targetPath: '$(Build.ArtifactStagingDirectory)'
-#       artifactName: '$(artifactName)'
-#   - script: |
-#       python -m pip install --upgrade pip twine
-#       cd '$(Agent.BuildDirectory)/s/build/wheelhouse/'
-#       python -m twine upload --repository "testpypi" *.whl
-#     condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/v'))
-#     displayName: "Upload to PyPI"
-#     env:
-#       TWINE_USERNAME: '__token__'
-#       TWINE_PASSWORD: $(TWINE_PASSWORD)
+- job: macOSBuilds
+  workspace:
+    clean: all
+  strategy:
+    matrix:
+      macOS_11:
+        poolName: 'Azure Pipelines'
+        vmImage: 'macOS-11'
+        agentName: 'Azure Pipelines 4'
+        artifactName: 'macOS-11'
+      macOS_12:
+        poolName: 'Azure Pipelines'
+        vmImage: 'macOS-12'
+        agentName: 'Azure Pipelines 3'
+        artifactName: 'macOS-12'
+      macOS_13_x64:
+        poolName: 'Azure Pipelines'
+        vmImage: 'macOS-13'
+        agentName: 'Azure Pipelines 2'
+        artifactName: 'macOS-13-x64'
+      # TODO: discuss with DevOps team how to setup ARM agent
+      # macOS_13_arm64:
+      #   poolName: 'Default'
+      #   vmImage:
+      #   agentName: 'macOS_arm64'
+      #   artifactName: 'macOS-13-arm64'
+  pool:
+    name: $(poolName)
+    vmImage: $(vmImage)
+    demands:
+      - agent.name -equals $(agentName)
+  variables:
+    PACKAGE_TO_INSTALL: 'build/*.pkg'
+  steps:
+  - checkout: self
+    fetchDepth: 1
+    clean: true
+  - script: ./CI/macOS/install_deps
+    displayName: "Install Dependencies"
+    condition: ne(variables['agentName'],'macOS_arm64')
+  - script: ./CI/macOS/make_macOS
+    displayName: "Build"
+  - ${{ each pyVersion in parameters.pythonVersions }}:
+    - task: UsePythonVersion@0
+      displayName: Use Python ${{ pyVersion }}
+      inputs:
+        versionSpec: '${{ pyVersion }}'
+    - script: |
+            python3 --version
+            python3 -m pip install wheel twine build virtualenv
+            cd '$(Agent.BuildDirectory)/s/build/'
+            mkdir -p wheelhouse
+            export COMPILE_BINDINGS=True
+            python3 -m build
+            export COMPILE_BINDINGS=
+            cp dist/*.whl wheelhouse
+      displayName: Wheel Python ${{ pyVersion }}
+  - task: CopyFiles@2
+    inputs:
+      sourceFolder: '$(Agent.BuildDirectory)/s/build/'
+      contents: '$(Agent.BuildDirectory)/s/build/?(*.pkg)'
+      targetFolder: '$(Build.ArtifactStagingDirectory)'
+  - task: CopyFiles@2
+    inputs:
+      sourceFolder: '$(Agent.BuildDirectory)/s/build/'
+      contents: '$(Agent.BuildDirectory)/s/build/wheelhouse/?(*.whl)'
+      targetFolder: '$(Build.ArtifactStagingDirectory)'
+  - task: CopyFiles@2
+    inputs:
+      sourceFolder: '$(Agent.BuildDirectory)/s/build_tar/'
+      contents: '$(Agent.BuildDirectory)/s/build_tar/?(*.tar.gz)'
+      targetFolder: '$(Build.ArtifactStagingDirectory)'
+  - task: PublishPipelineArtifact@1
+    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
+    inputs:
+      targetPath: '$(Build.ArtifactStagingDirectory)'
+      artifactName: '$(artifactName)'
+  - script: |
+      python -m pip install --upgrade pip twine
+      cd '$(Agent.BuildDirectory)/s/build/wheelhouse/'
+      python -m twine upload --repository "testpypi" *.whl
+    condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/v'))
+    displayName: "Upload to PyPI"
+    env:
+      TWINE_USERNAME: '__token__'
+      TWINE_PASSWORD: $(TWINE_PASSWORD)
 
-  - job: WindowsBuilds
-    workspace:
-      clean: all
-    strategy:
-      matrix:
-        VS_2022:
-          poolName: 'Azure Pipelines'
-          vmImage: 'windows-2022'
-          COMPILER: 'Visual Studio 17 2022'
-          ARCH: 'x64'
-          PLATFORM: 'win64'
-          artifactName: 'Windows-VS-2022-x64'
-        VS_2019:
-          poolName: 'Azure Pipelines'
-          vmImage: 'windows-2019'
-          COMPILER: 'Visual Studio 16 2019'
-          ARCH: 'x64'
-          PLATFORM: 'win64'
-          artifactName: 'Windows-VS-2019-x64'
-    pool:
-      vmImage: $[ variables['vmImage'] ]
-    steps:
-      - checkout: self
-        fetchDepth: 1
-        clean: true
+- job: WindowsBuilds
+  workspace:
+    clean: all
+  strategy:
+    matrix:
+      VS_2022:
+        poolName: 'Azure Pipelines'
+        vmImage: 'windows-2022'
+        COMPILER: 'Visual Studio 17 2022'
+        ARCH: 'x64'
+        PLATFORM: 'win64'
+        artifactName: 'Windows-VS-2022-x64'
+      VS_2019:
+        poolName: 'Azure Pipelines'
+        vmImage: 'windows-2019'
+        COMPILER: 'Visual Studio 16 2019'
+        ARCH: 'x64'
+        PLATFORM: 'win64'
+        artifactName: 'Windows-VS-2019-x64'
+  pool:
+    vmImage: $[ variables['vmImage'] ]
+  steps:
+    - checkout: self
+      fetchDepth: 1
+      clean: true
+    - task: UsePythonVersion@0
+      inputs:
+        versionSpec: '3.11'
+    - task: PowerShell@2
+      displayName: 'Install Dependencies'
+      inputs: 
+        targetType: filePath
+        filePath: ./CI/windows/install_deps.ps1
+    - task: PowerShell@2
+      displayName: "Build libm2k"
+      inputs:
+        targetType: 'filePath'
+        filePath: ./CI/windows/make_windows.ps1
+    - ${{ each pyVersion in parameters.pythonVersions }}:
       - task: UsePythonVersion@0
+        displayName: Use Python ${{ pyVersion }}
         inputs:
-          versionSpec: '3.11'
-      - task: PowerShell@2
-        displayName: 'Install Dependencies'
-        inputs: 
-          targetType: filePath
-          filePath: ./CI/windows/install_deps.ps1
-      - task: PowerShell@2
-        displayName: "Build libm2k"
-        inputs:
-          targetType: 'filePath'
-          filePath: ./CI/windows/make_windows.ps1
-      - ${{ each pyVersion in parameters.pythonVersions }}:
-        - task: UsePythonVersion@0
-          displayName: Use Python ${{ pyVersion }}
-          inputs:
-            versionSpec: '${{ pyVersion }}'
-        - powershell: |
-                $SRC_DIR = Get-Item -Path $env:BUILD_SOURCESDIRECTORY
-                $OUTSIDE_BUILD = $SRC_DIR.Parent.FullName
+          versionSpec: '${{ pyVersion }}'
+      - powershell: |
+              $SRC_DIR = Get-Item -Path $env:BUILD_SOURCESDIRECTORY
+              $OUTSIDE_BUILD = $SRC_DIR.Parent.FullName
 
-                $BUILD_DIR = Join-Path $OUTSIDE_BUILD "libm2k-$Env:PLATFORM\dist"
-                $TEMP_BUILD_DIR = Join-Path $SRC_DIR "tmp-build-$Env:PLATFORM"
+              $BUILD_DIR = Join-Path $OUTSIDE_BUILD "libm2k-$env:PLATFORM"
+              $TEMP_BUILD_DIR = Join-Path $SRC_DIR "tmp-build-$env:PLATFORM"
 
-                Set-Location $TEMP_BUILD_DIR
-                python.exe -m pip install --user --upgrade pip setuptools wheel twine build virtualenv
-                $env:COMPILE_BINDINGS = $true
-                python.exe -m build
-                Remove-Item Env:COMPILE_BINDINGS
-                Copy-Item -Path "dist/libm2k*.whl" -Destination (Join-Path $BUILD_DIR "dist")
-                Set-Location $SRC_DIR
-          displayName: Wheel Python ${{ pyVersion }}
-      - task: PowerShell@2
-        displayName: 'Create libm2k-system-setup installer'
-        condition: and(succeeded(), eq(variables['System.JobName'], 'VS_2022'))
-        inputs:
-          targetType: 'filePath'
-          filePath: ./CI/windows/create_installer.ps1
-      - task: PublishPipelineArtifact@1
-        condition: eq(variables['System.JobName'], 'VS_2022')
-        inputs:
-          targetPath: '$(Build.ArtifactStagingDirectory)/installer'
-          artifactName: 'Libm2k-System-Setup-Exe'
-      - task: PowerShell@2
-        displayName: "Create ZIPs"
-        inputs:
-          targetType: 'filePath'
-          filePath: ./CI/windows/create_zips.ps1
-      - task: PublishPipelineArtifact@1
-        inputs:
-          targetPath: '$(Build.ArtifactStagingDirectory)/libm2k-$(PLATFORM)'
-          artifactName: '$(artifactName)'
+              Set-Location $TEMP_BUILD_DIR
+              python.exe -m pip install --user --upgrade pip setuptools wheel twine build virtualenv
+              $env:COMPILE_BINDINGS = $true
+              python.exe -m build
+              Remove-Item Env:COMPILE_BINDINGS
+              Copy-Item -Path "dist/libm2k*.whl" -Destination (Join-Path $BUILD_DIR "dist")
+              Set-Location $SRC_DIR
+        displayName: Wheel Python ${{ pyVersion }}
+        condition: eq('${{ pyVersion }}', '3.11')
+    - task: PowerShell@2
+      displayName: 'Create libm2k-system-setup installer'
+      condition: and(succeeded(), eq(variables['System.JobName'], 'VS_2022'))
+      inputs:
+        targetType: 'filePath'
+        filePath: ./CI/windows/create_installer.ps1
+    - task: PublishPipelineArtifact@1
+      condition: eq(variables['System.JobName'], 'VS_2022')
+      inputs:
+        targetPath: '$(Build.ArtifactStagingDirectory)/installer'
+        artifactName: 'Libm2k-System-Setup-Exe'
+    - task: PowerShell@2
+      displayName: "Create ZIPs"
+      inputs:
+        targetType: 'filePath'
+        filePath: ./CI/windows/create_zips.ps1
+    - task: PublishPipelineArtifact@1
+      inputs:
+        targetPath: '$(Build.ArtifactStagingDirectory)/libm2k-$(PLATFORM)'
+        artifactName: '$(artifactName)'