diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/platform-config/r0/PKG.yml b/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/platform-config/r0/PKG.yml
deleted file mode 100644
index d3edd871..00000000
--- a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/platform-config/r0/PKG.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-!include $ONL_TEMPLATES/platform-config-platform.yml ARCH=amd64 VENDOR=alphanetworks PLATFORM=x86-64-alphanetworks-snx60a0-486f-r0
-
-
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/.gitignore b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/.gitignore
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/.gitignore
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/.gitignore
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/Makefile b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/Makefile
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/Makefile
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/Makefile
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/Makefile b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/Makefile
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/Makefile
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/Makefile
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/PKG.yml b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/PKG.yml
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/PKG.yml
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/PKG.yml
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/Makefile b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/Makefile
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/Makefile
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/Makefile
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/lib/Makefile b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/lib/Makefile
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/lib/Makefile
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/lib/Makefile
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/lib/libonlp-x86-64-alphanetworks-snx60a0-486f.mk b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/lib/libonlp-x86-64-alphanetworks-snx60a0-486f.mk
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/lib/libonlp-x86-64-alphanetworks-snx60a0-486f.mk
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/lib/libonlp-x86-64-alphanetworks-snx60a0-486f.mk
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/lib/x86_64_alphanetworks_snx60a0_486f.mk b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/lib/x86_64_alphanetworks_snx60a0_486f.mk
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/lib/x86_64_alphanetworks_snx60a0_486f.mk
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/lib/x86_64_alphanetworks_snx60a0_486f.mk
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/onlpdump/Makefile b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/onlpdump/Makefile
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/onlpdump/Makefile
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/onlpdump/Makefile
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/.module b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/.module
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/.module
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/.module
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/Makefile b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/Makefile
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/Makefile
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/Makefile
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/README b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/README
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/README
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/README
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/auto/make.mk b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/auto/make.mk
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/auto/make.mk
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/auto/make.mk
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/auto/x86_64_alphanetworks_snx60a0_486f.yml b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/auto/x86_64_alphanetworks_snx60a0_486f.yml
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/auto/x86_64_alphanetworks_snx60a0_486f.yml
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/auto/x86_64_alphanetworks_snx60a0_486f.yml
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/inc/x86_64_alphanetworks_snx60a0_486f/x86_64_alphanetworks_snx60a0_486f.x b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/inc/x86_64_alphanetworks_snx60a0_486f/x86_64_alphanetworks_snx60a0_486f.x
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/inc/x86_64_alphanetworks_snx60a0_486f/x86_64_alphanetworks_snx60a0_486f.x
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/inc/x86_64_alphanetworks_snx60a0_486f/x86_64_alphanetworks_snx60a0_486f.x
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/inc/x86_64_alphanetworks_snx60a0_486f/x86_64_alphanetworks_snx60a0_486f_config.h b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/inc/x86_64_alphanetworks_snx60a0_486f/x86_64_alphanetworks_snx60a0_486f_config.h
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/inc/x86_64_alphanetworks_snx60a0_486f/x86_64_alphanetworks_snx60a0_486f_config.h
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/inc/x86_64_alphanetworks_snx60a0_486f/x86_64_alphanetworks_snx60a0_486f_config.h
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/inc/x86_64_alphanetworks_snx60a0_486f/x86_64_alphanetworks_snx60a0_486f_dox.h b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/inc/x86_64_alphanetworks_snx60a0_486f/x86_64_alphanetworks_snx60a0_486f_dox.h
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/inc/x86_64_alphanetworks_snx60a0_486f/x86_64_alphanetworks_snx60a0_486f_dox.h
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/inc/x86_64_alphanetworks_snx60a0_486f/x86_64_alphanetworks_snx60a0_486f_dox.h
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/inc/x86_64_alphanetworks_snx60a0_486f/x86_64_alphanetworks_snx60a0_486f_porting.h b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/inc/x86_64_alphanetworks_snx60a0_486f/x86_64_alphanetworks_snx60a0_486f_porting.h
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/inc/x86_64_alphanetworks_snx60a0_486f/x86_64_alphanetworks_snx60a0_486f_porting.h
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/inc/x86_64_alphanetworks_snx60a0_486f/x86_64_alphanetworks_snx60a0_486f_porting.h
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/make.mk b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/make.mk
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/make.mk
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/make.mk
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/Makefile b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/Makefile
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/Makefile
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/Makefile
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/make.mk b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/make.mk
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/make.mk
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/make.mk
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/x86_64_alphanetworks_snx60a0_486f_config.c b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/x86_64_alphanetworks_snx60a0_486f_config.c
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/x86_64_alphanetworks_snx60a0_486f_config.c
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/x86_64_alphanetworks_snx60a0_486f_config.c
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/x86_64_alphanetworks_snx60a0_486f_enums.c b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/x86_64_alphanetworks_snx60a0_486f_enums.c
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/x86_64_alphanetworks_snx60a0_486f_enums.c
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/x86_64_alphanetworks_snx60a0_486f_enums.c
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/x86_64_alphanetworks_snx60a0_486f_int.h b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/x86_64_alphanetworks_snx60a0_486f_int.h
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/x86_64_alphanetworks_snx60a0_486f_int.h
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/x86_64_alphanetworks_snx60a0_486f_int.h
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/x86_64_alphanetworks_snx60a0_486f_log.c b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/x86_64_alphanetworks_snx60a0_486f_log.c
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/x86_64_alphanetworks_snx60a0_486f_log.c
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/x86_64_alphanetworks_snx60a0_486f_log.c
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/x86_64_alphanetworks_snx60a0_486f_log.h b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/x86_64_alphanetworks_snx60a0_486f_log.h
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/x86_64_alphanetworks_snx60a0_486f_log.h
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/x86_64_alphanetworks_snx60a0_486f_log.h
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/x86_64_alphanetworks_snx60a0_486f_module.c b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/x86_64_alphanetworks_snx60a0_486f_module.c
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/x86_64_alphanetworks_snx60a0_486f_module.c
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/x86_64_alphanetworks_snx60a0_486f_module.c
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/x86_64_alphanetworks_snx60a0_486f_ucli.c b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/x86_64_alphanetworks_snx60a0_486f_ucli.c
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/x86_64_alphanetworks_snx60a0_486f_ucli.c
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/module/src/x86_64_alphanetworks_snx60a0_486f_ucli.c
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/utest/_make.mk b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/utest/_make.mk
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/utest/_make.mk
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/utest/_make.mk
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/utest/main.c b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/utest/main.c
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/utest/main.c
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/utest/main.c
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/x86_64_alphanetworks_snx60a0_486f.doxy b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/x86_64_alphanetworks_snx60a0_486f.doxy
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/x86_64_alphanetworks_snx60a0_486f.doxy
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/x86_64_alphanetworks_snx60a0_486f.doxy
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/x86_64_alphanetworks_snx60a0_486f.mk b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/x86_64_alphanetworks_snx60a0_486f.mk
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/x86_64_alphanetworks_snx60a0_486f.mk
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/onlp/builds/src/x86_64_alphanetworks_snx60a0_486f/x86_64_alphanetworks_snx60a0_486f.mk
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/platform-config/Makefile b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/platform-config/Makefile
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/platform-config/Makefile
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/platform-config/Makefile
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/platform-config/r0/Makefile b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/platform-config/r0/Makefile
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/platform-config/r0/Makefile
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/platform-config/r0/Makefile
diff --git a/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/platform-config/r0/PKG.yml b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/platform-config/r0/PKG.yml
new file mode 100644
index 00000000..2edd0acb
--- /dev/null
+++ b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/platform-config/r0/PKG.yml
@@ -0,0 +1 @@
+!include $ONL_TEMPLATES/platform-config-platform.yml ARCH=amd64 VENDOR=alphanetworks BASENAME=x86-64-alphanetworks-snx60a0-486f REVISION=r0
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/platform-config/r0/src/lib/x86-64-alphanetworks-snx60a0-486f-r0.yml b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/platform-config/r0/src/lib/x86-64-alphanetworks-snx60a0-486f-r0.yml
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/platform-config/r0/src/lib/x86-64-alphanetworks-snx60a0-486f-r0.yml
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/platform-config/r0/src/lib/x86-64-alphanetworks-snx60a0-486f-r0.yml
diff --git a/packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/platform-config/r0/src/python/x86_64_alphanetworks_snx60a0_486f_r0/__init__.py b/packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/platform-config/r0/src/python/x86_64_alphanetworks_snx60a0_486f_r0/__init__.py
similarity index 100%
rename from packages/platforms/alphanetworks/x86-64-alphanetworks-snx60a0-486f/platform-config/r0/src/python/x86_64_alphanetworks_snx60a0_486f_r0/__init__.py
rename to packages/platforms/alphanetworks/x86-64/x86-64-alphanetworks-snx60a0-486f/platform-config/r0/src/python/x86_64_alphanetworks_snx60a0_486f_r0/__init__.py