diff --git a/build.py b/build.py
index dc1f1517..08be71b9 100755
--- a/build.py
+++ b/build.py
@@ -1386,7 +1386,7 @@ def cmd_build_wx(options, args):
         # Windows-specific pre build stuff
         if options.cairo:
             build_options.append('--cairo')
-            cairo_root = os.path.join(phoenixDir(), 'packaging', 'cairo-msw')
+            cairo_root = os.path.join(phoenixDir(), 'packaging', 'msw-cairo')
             os.environ['CAIRO_ROOT'] = cairo_root
 
         if options.jom:
@@ -1518,7 +1518,7 @@ def copyWxDlls(options):
 
         # Also copy the cairo DLLs if needed
         if options.cairo:
-            cairo_root = os.path.join(phoenixDir(), 'packaging', 'cairo-msw')
+            cairo_root = os.path.join(phoenixDir(), 'packaging', 'msw-cairo')
             dlls += glob.glob(os.path.join(cairo_root, arch, 'bin', '*.dll'))
 
         # For Python 3.5 and 3.6 builds we also need to copy some VC14 redist DLLs.
@@ -1526,7 +1526,7 @@ def copyWxDlls(options):
         # this may need to change. See notes in wscript about it.
         if PYVER in ['3.5', '3.6', '3.7', '3.8', '3.9']:
             redist_dir = os.path.join(
-                phoenixDir(), 'packaging', 'Py3.5', 'vcredist',
+                phoenixDir(), 'packaging', 'msw-vcredist',
                 arch, 'Microsoft.VC140.CRT', '*.dll')
             dlls += glob.glob(redist_dir)
 
diff --git a/packaging/cairo-msw/README.txt b/packaging/msw-cairo/README.txt
similarity index 100%
rename from packaging/cairo-msw/README.txt
rename to packaging/msw-cairo/README.txt
diff --git a/packaging/cairo-msw/include/cairo/cairo-deprecated.h b/packaging/msw-cairo/include/cairo/cairo-deprecated.h
similarity index 100%
rename from packaging/cairo-msw/include/cairo/cairo-deprecated.h
rename to packaging/msw-cairo/include/cairo/cairo-deprecated.h
diff --git a/packaging/cairo-msw/include/cairo/cairo-features.h b/packaging/msw-cairo/include/cairo/cairo-features.h
similarity index 100%
rename from packaging/cairo-msw/include/cairo/cairo-features.h
rename to packaging/msw-cairo/include/cairo/cairo-features.h
diff --git a/packaging/cairo-msw/include/cairo/cairo-ft.h b/packaging/msw-cairo/include/cairo/cairo-ft.h
similarity index 100%
rename from packaging/cairo-msw/include/cairo/cairo-ft.h
rename to packaging/msw-cairo/include/cairo/cairo-ft.h
diff --git a/packaging/cairo-msw/include/cairo/cairo-pdf.h b/packaging/msw-cairo/include/cairo/cairo-pdf.h
similarity index 100%
rename from packaging/cairo-msw/include/cairo/cairo-pdf.h
rename to packaging/msw-cairo/include/cairo/cairo-pdf.h
diff --git a/packaging/cairo-msw/include/cairo/cairo-ps.h b/packaging/msw-cairo/include/cairo/cairo-ps.h
similarity index 100%
rename from packaging/cairo-msw/include/cairo/cairo-ps.h
rename to packaging/msw-cairo/include/cairo/cairo-ps.h
diff --git a/packaging/cairo-msw/include/cairo/cairo-script.h b/packaging/msw-cairo/include/cairo/cairo-script.h
similarity index 100%
rename from packaging/cairo-msw/include/cairo/cairo-script.h
rename to packaging/msw-cairo/include/cairo/cairo-script.h
diff --git a/packaging/cairo-msw/include/cairo/cairo-svg.h b/packaging/msw-cairo/include/cairo/cairo-svg.h
similarity index 100%
rename from packaging/cairo-msw/include/cairo/cairo-svg.h
rename to packaging/msw-cairo/include/cairo/cairo-svg.h
diff --git a/packaging/cairo-msw/include/cairo/cairo-version.h b/packaging/msw-cairo/include/cairo/cairo-version.h
similarity index 100%
rename from packaging/cairo-msw/include/cairo/cairo-version.h
rename to packaging/msw-cairo/include/cairo/cairo-version.h
diff --git a/packaging/cairo-msw/include/cairo/cairo-win32.h b/packaging/msw-cairo/include/cairo/cairo-win32.h
similarity index 100%
rename from packaging/cairo-msw/include/cairo/cairo-win32.h
rename to packaging/msw-cairo/include/cairo/cairo-win32.h
diff --git a/packaging/cairo-msw/include/cairo/cairo.h b/packaging/msw-cairo/include/cairo/cairo.h
similarity index 100%
rename from packaging/cairo-msw/include/cairo/cairo.h
rename to packaging/msw-cairo/include/cairo/cairo.h
diff --git a/packaging/cairo-msw/x64/bin/libcairo-2.dll b/packaging/msw-cairo/x64/bin/libcairo-2.dll
similarity index 100%
rename from packaging/cairo-msw/x64/bin/libcairo-2.dll
rename to packaging/msw-cairo/x64/bin/libcairo-2.dll
diff --git a/packaging/cairo-msw/x86/bin/libcairo-2.dll b/packaging/msw-cairo/x86/bin/libcairo-2.dll
similarity index 100%
rename from packaging/cairo-msw/x86/bin/libcairo-2.dll
rename to packaging/msw-cairo/x86/bin/libcairo-2.dll
diff --git a/packaging/Py3.5/vcredist/x64/Microsoft.VC140.CRT/msvcp140.dll b/packaging/msw-vcredist/x64/Microsoft.VC140.CRT/msvcp140.dll
similarity index 100%
rename from packaging/Py3.5/vcredist/x64/Microsoft.VC140.CRT/msvcp140.dll
rename to packaging/msw-vcredist/x64/Microsoft.VC140.CRT/msvcp140.dll
diff --git a/packaging/Py3.5/vcredist/x64/Microsoft.VC140.CRT/vcruntime140.dll b/packaging/msw-vcredist/x64/Microsoft.VC140.CRT/vcruntime140.dll
similarity index 100%
rename from packaging/Py3.5/vcredist/x64/Microsoft.VC140.CRT/vcruntime140.dll
rename to packaging/msw-vcredist/x64/Microsoft.VC140.CRT/vcruntime140.dll
diff --git a/packaging/Py3.5/vcredist/x86/Microsoft.VC140.CRT/msvcp140.dll b/packaging/msw-vcredist/x86/Microsoft.VC140.CRT/msvcp140.dll
similarity index 100%
rename from packaging/Py3.5/vcredist/x86/Microsoft.VC140.CRT/msvcp140.dll
rename to packaging/msw-vcredist/x86/Microsoft.VC140.CRT/msvcp140.dll
diff --git a/packaging/Py3.5/vcredist/x86/Microsoft.VC140.CRT/vcruntime140.dll b/packaging/msw-vcredist/x86/Microsoft.VC140.CRT/vcruntime140.dll
similarity index 100%
rename from packaging/Py3.5/vcredist/x86/Microsoft.VC140.CRT/vcruntime140.dll
rename to packaging/msw-vcredist/x86/Microsoft.VC140.CRT/vcruntime140.dll