diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc b/meta-openbmc-bsp/meta-aspeed/conf/machine/include/ast2400.inc
similarity index 100%
rename from meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc
rename to meta-openbmc-bsp/meta-aspeed/conf/machine/include/ast2400.inc
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/machine/include/ast2500.inc b/meta-openbmc-bsp/meta-aspeed/conf/machine/include/ast2500.inc
similarity index 100%
rename from meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/machine/include/ast2500.inc
rename to meta-openbmc-bsp/meta-aspeed/conf/machine/include/ast2500.inc
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/machine/include/tune-arm1176jz-s.inc b/meta-openbmc-bsp/meta-aspeed/conf/machine/include/tune-arm1176jz-s.inc
similarity index 100%
rename from meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/machine/include/tune-arm1176jz-s.inc
rename to meta-openbmc-bsp/meta-aspeed/conf/machine/include/tune-arm1176jz-s.inc