diff --git a/mozconfigs/uxp-android-arm32 b/mozconfigs/android/uxp-android-arm32
similarity index 100%
rename from mozconfigs/uxp-android-arm32
rename to mozconfigs/android/uxp-android-arm32
diff --git a/mozconfigs/uxp-darwin-ppc32 b/mozconfigs/darwin/uxp-darwin-ppc32
similarity index 100%
rename from mozconfigs/uxp-darwin-ppc32
rename to mozconfigs/darwin/uxp-darwin-ppc32
diff --git a/mozconfigs/uxp-darwin-x64 b/mozconfigs/darwin/uxp-darwin-x64
similarity index 100%
rename from mozconfigs/uxp-darwin-x64
rename to mozconfigs/darwin/uxp-darwin-x64
diff --git a/mozconfigs/uxp-linux-x64 b/mozconfigs/linux/uxp-linux-x64
similarity index 100%
rename from mozconfigs/uxp-linux-x64
rename to mozconfigs/linux/uxp-linux-x64
diff --git a/mozconfigs/uxp-win32-mingw32 b/mozconfigs/windows/uxp-win32-mingw32
similarity index 100%
rename from mozconfigs/uxp-win32-mingw32
rename to mozconfigs/windows/uxp-win32-mingw32
diff --git a/mozconfigs/uxp-win32-msvc b/mozconfigs/windows/uxp-win32-msvc
similarity index 100%
rename from mozconfigs/uxp-win32-msvc
rename to mozconfigs/windows/uxp-win32-msvc
diff --git a/mozconfigs/uxp-win64 b/mozconfigs/windows/uxp-win64
similarity index 100%
rename from mozconfigs/uxp-win64
rename to mozconfigs/windows/uxp-win64