diff --git a/packages/platforms/quanta/x86-64-quanta-ly6-rangeley/platform-config/Makefile b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/Makefile
similarity index 100%
rename from packages/platforms/quanta/x86-64-quanta-ly6-rangeley/platform-config/Makefile
rename to packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/Makefile
diff --git a/packages/platforms/quanta/x86-64-quanta-ly6-rangeley/platform-config/r0/Makefile b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/Makefile
similarity index 100%
rename from packages/platforms/quanta/x86-64-quanta-ly6-rangeley/platform-config/r0/Makefile
rename to packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/Makefile
diff --git a/packages/platforms/quanta/x86-64-quanta-ly6-rangeley/platform-config/r0/PKG.yml b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/PKG.yml
similarity index 100%
rename from packages/platforms/quanta/x86-64-quanta-ly6-rangeley/platform-config/r0/PKG.yml
rename to packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/PKG.yml
diff --git a/packages/platforms/quanta/x86-64-quanta-ly6-rangeley/platform-config/r0/src/lib/boot/grub.cfg b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/src/lib/boot/grub.cfg
similarity index 100%
rename from packages/platforms/quanta/x86-64-quanta-ly6-rangeley/platform-config/r0/src/lib/boot/grub.cfg
rename to packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/src/lib/boot/grub.cfg
diff --git a/packages/platforms/quanta/x86-64-quanta-ly6-rangeley/platform-config/r0/src/lib/boot/x86-64-quanta-ly6-rangeley-r0 b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/src/lib/boot/x86-64-quanta-ly6-rangeley-r0
similarity index 100%
rename from packages/platforms/quanta/x86-64-quanta-ly6-rangeley/platform-config/r0/src/lib/boot/x86-64-quanta-ly6-rangeley-r0
rename to packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/src/lib/boot/x86-64-quanta-ly6-rangeley-r0
diff --git a/packages/platforms/quanta/x86-64-quanta-ly6-rangeley/platform-config/r0/src/lib/install/x86-64-quanta-ly6-rangeley-r0.sh b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/src/lib/install/x86-64-quanta-ly6-rangeley-r0.sh
similarity index 100%
rename from packages/platforms/quanta/x86-64-quanta-ly6-rangeley/platform-config/r0/src/lib/install/x86-64-quanta-ly6-rangeley-r0.sh
rename to packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/src/lib/install/x86-64-quanta-ly6-rangeley-r0.sh
diff --git a/packages/platforms/quanta/x86-64-quanta-ly6-rangeley/platform-config/r0/src/python/x86-64-quanta-ly6-rangeley-r0/__init__.py b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/src/python/x86-64-quanta-ly6-rangeley-r0/__init__.py
similarity index 100%
rename from packages/platforms/quanta/x86-64-quanta-ly6-rangeley/platform-config/r0/src/python/x86-64-quanta-ly6-rangeley-r0/__init__.py
rename to packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/src/python/x86-64-quanta-ly6-rangeley-r0/__init__.py
diff --git a/packages/platforms/quanta/x86-64-quanta-ly8-rangely/platform-config/Makefile b/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangely/platform-config/Makefile
similarity index 100%
rename from packages/platforms/quanta/x86-64-quanta-ly8-rangely/platform-config/Makefile
rename to packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangely/platform-config/Makefile
diff --git a/packages/platforms/quanta/x86-64-quanta-ly8-rangely/platform-config/r0/Makefile b/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangely/platform-config/r0/Makefile
similarity index 100%
rename from packages/platforms/quanta/x86-64-quanta-ly8-rangely/platform-config/r0/Makefile
rename to packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangely/platform-config/r0/Makefile
diff --git a/packages/platforms/quanta/x86-64-quanta-ly8-rangely/platform-config/r0/PKG.yml b/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangely/platform-config/r0/PKG.yml
similarity index 100%
rename from packages/platforms/quanta/x86-64-quanta-ly8-rangely/platform-config/r0/PKG.yml
rename to packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangely/platform-config/r0/PKG.yml
diff --git a/packages/platforms/quanta/x86-64-quanta-ly8-rangely/platform-config/r0/src/lib/boot/grub.cfg b/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangely/platform-config/r0/src/lib/boot/grub.cfg
similarity index 100%
rename from packages/platforms/quanta/x86-64-quanta-ly8-rangely/platform-config/r0/src/lib/boot/grub.cfg
rename to packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangely/platform-config/r0/src/lib/boot/grub.cfg
diff --git a/packages/platforms/quanta/x86-64-quanta-ly8-rangely/platform-config/r0/src/lib/boot/x86-64-quanta-ly8-rangeley-r0 b/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangely/platform-config/r0/src/lib/boot/x86-64-quanta-ly8-rangeley-r0
similarity index 100%
rename from packages/platforms/quanta/x86-64-quanta-ly8-rangely/platform-config/r0/src/lib/boot/x86-64-quanta-ly8-rangeley-r0
rename to packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangely/platform-config/r0/src/lib/boot/x86-64-quanta-ly8-rangeley-r0
diff --git a/packages/platforms/quanta/x86-64-quanta-ly8-rangely/platform-config/r0/src/lib/install/x86-64-quanta-ly8-rangeley-r0.sh b/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangely/platform-config/r0/src/lib/install/x86-64-quanta-ly8-rangeley-r0.sh
similarity index 100%
rename from packages/platforms/quanta/x86-64-quanta-ly8-rangely/platform-config/r0/src/lib/install/x86-64-quanta-ly8-rangeley-r0.sh
rename to packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangely/platform-config/r0/src/lib/install/x86-64-quanta-ly8-rangeley-r0.sh
diff --git a/packages/platforms/quanta/x86-64-quanta-ly8-rangely/platform-config/r0/src/python/x86-64-quanta-ly8-rangeley-r0/__init__.py b/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangely/platform-config/r0/src/python/x86-64-quanta-ly8-rangeley-r0/__init__.py
similarity index 100%
rename from packages/platforms/quanta/x86-64-quanta-ly8-rangely/platform-config/r0/src/python/x86-64-quanta-ly8-rangeley-r0/__init__.py
rename to packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangely/platform-config/r0/src/python/x86-64-quanta-ly8-rangeley-r0/__init__.py